diff --git a/checkin_notes b/checkin_notes
index 1fe7e5426d..411d0f9e91 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11348,3 +11348,17 @@ Rom 2 Aug 2005
ViewStatistics.cpp
ViewTransfers.cpp
ViewWork.cpp
+
+David 2 Aug 2005
+ - show app version numbers as single ints
+ (remove major*100 + minor assumption)
+ - remove commented-out code (lock_file stuff)
+
+ lib/
+ filesys.h
+ sched/
+ assimilator.C
+ file_deleter.C
+ make_work.C
+ transitioner.C
+ update_stats.C
diff --git a/client/app_start.C b/client/app_start.C
index 873a8af3fb..4d6ff11200 100644
--- a/client/app_start.C
+++ b/client/app_start.C
@@ -517,11 +517,11 @@ int ACTIVE_TASK::resume_or_start() {
return 0;
}
msg_printf(result->project, MSG_INFO,
- "%s result %s using %s version %.2f",
+ "%s result %s using %s version %d",
str,
result->name,
app_version->app->name,
- app_version->version_num/100.
+ app_version->version_num
);
return 0;
}
@@ -569,10 +569,10 @@ int ACTIVE_TASK_SET::restart_tasks(int max_tasks) {
}
msg_printf(atp->wup->project, MSG_INFO,
- "Resuming computation for result %s using %s version %.2f",
+ "Resuming computation for result %s using %s version %d",
atp->result->name,
atp->app_version->app->name,
- atp->app_version->version_num/100.
+ atp->app_version->version_num
);
retval = atp->start(false);
diff --git a/client/client_types.C b/client/client_types.C
index 1fc7e79a87..82a9744b2f 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -1386,12 +1386,6 @@ bool RESULT::is_upload_done() {
return true;
}
-void RESULT::get_app_version_string(string& str) {
- char buf[256];
- sprintf(buf, " %.2f", wup->version_num/100.);
- str = app->name + string(buf);
-}
-
// resets all FILE_INFO's in result to uploaded = false
// if upload_when_present is true.
// Also updates the last time the input files were used
diff --git a/client/client_types.h b/client/client_types.h
index fcdd9a64b5..d236d93991 100644
--- a/client/client_types.h
+++ b/client/client_types.h
@@ -422,7 +422,6 @@ struct RESULT {
int write(MIOFILE&, bool to_server);
int write_gui(MIOFILE&);
bool is_upload_done(); // files uploaded?
- void get_app_version_string(std::string&);
void reset_files();
FILE_REF* lookup_file(FILE_INFO*);
FILE_INFO* lookup_file_logical(const char*);
diff --git a/doc/boinc_dev.php b/doc/boinc_dev.php
index cee500aab5..104cbd7f29 100644
--- a/doc/boinc_dev.php
+++ b/doc/boinc_dev.php
@@ -3,27 +3,35 @@ require_once("docutil.php");
page_head("Development and debugging");
echo "
-
-If you do C++ system programming you may be able
-to help us maintain and enhance BOINC.
-In any case, you are welcome to browse the source code and
-give us feedback.
-You should understand how BOINC works
-(for both participants
-and projects)
-before getting into the source code.
-Check out the following:
+Getting involved
+
+BOINC is free software, distributed under the Lesser GNU Public License (LGPL).
+We are in constant need of volunteers to
+help with software testing and development.
+If you have one or more of the relevant technical skills
+(C++ system programming, PHP/MySQL web development,
+WxWidgets programming, autoconf/automake expertise, etc.)
+you may be able to help us maintain and enhance BOINC.
+In any case, you are welcome to browse the source code and give us feedback.
+You should understand how BOINC works
+(for both participants
+and projects)
+before getting into the source code.
+
+To get started, look at the BOINC bug database, fix a bug or two,
+and send your patches to the appropriate area owner.
The following medium-to-large development projects are available:
- BOINC Manager:
diff --git a/doc/contact.php b/doc/contact.php
index e92111d449..0e4f1eeedc 100644
--- a/doc/contact.php
+++ b/doc/contact.php
@@ -84,9 +84,9 @@ Each area is managed by an 'owner'.
-
Contributors
-The following people have contributed to
-the development of BOINC:
+Developers
+The following people have contributed to the development of
+the BOINC software:
";
$i = 0;
@@ -164,8 +164,9 @@ show_name("Oliver Wang");
show_name("Frank Weiler");
echo "
+
Testers
-BOINC testers include:
+BOINC alpha testers include:
";
$i = 0;
diff --git a/doc/dev_flow.php b/doc/dev_flow.php
index 190ca76f6e..accbf538a7 100644
--- a/doc/dev_flow.php
+++ b/doc/dev_flow.php
@@ -26,7 +26,7 @@ BOINC message boards are here.
- Learn of new releases on the BOINC web site.
- Note: we need ways of 'pushing' info to participants, e.g. via the Manager.
-Owners
+Area owners
- Reads the relevant BOINC message board on a regular basis.
Decides if new bugs are present.
diff --git a/doc/download_other.php b/doc/download_other.php
index 56595deefd..86c9217493 100644
--- a/doc/download_other.php
+++ b/doc/download_other.php
@@ -22,6 +22,16 @@ list_start();
list_heading_array(array(
"Site", "Platforms", "Programs available"
));
+list_item_array(array(
+ "Harold Naparst",
+ "Linux/x86",
+ "SETI@home application"
+));
+list_item_array(array(
+ "SETI@home and BOINC on Linux",
+ "Mandrake Linux",
+ "BOINC and SETI@home (graphical versions)"
+));
list_item_array(array(
"macnn.com",
"Mac OS X",
diff --git a/doc/index.php b/doc/index.php
index 39370253bb..9a5c6862e9 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -17,8 +17,8 @@ echo "
Berkeley Open Infrastructure for Network Computing
-A software platform for distributed computing using volunteered
-computer resources
+An open-source software platform for computing using volunteered
+resources
@@ -67,6 +67,16 @@ computer resources
you ensure that your computer will be kept busy
even when one project has no work.
+ There are several Wikis
+ with user-editable information and documentation about BOINC:
+
+
+ ... and many other web sites for BOINC participants.
+
... more
@@ -75,7 +85,6 @@ computer resources
If you're a scientist with a computationally-intensive task,
you may be able to use BOINC.
-
A BOINC project requires just a single Linux server,
and can provide computing power equivalent
to a cluster with tens of thousands of nodes.
@@ -85,31 +94,18 @@ computer resources
|
- Other Info |
+ Other info |
diff --git a/lib/filesys.h b/lib/filesys.h
index 44e2ac50bd..0ade915da2 100755
--- a/lib/filesys.h
+++ b/lib/filesys.h
@@ -67,7 +67,6 @@ extern "C" {
extern int boinc_rename(const char* old, const char* newf);
extern int boinc_mkdir(const char*);
extern int boinc_rmdir(const char*);
- extern int lock_file(const char*);
extern void relative_to_absolute(const char* relname, char* path);
extern int boinc_make_dirs(char*, char*);
extern char boinc_failed_file[256];
diff --git a/sched/assimilator.C b/sched/assimilator.C
index 01b523257d..689387284e 100644
--- a/sched/assimilator.C
+++ b/sched/assimilator.C
@@ -196,12 +196,6 @@ int main(int argc, char** argv) {
}
}
- // // Call lock_file after fork(), because file locks are not always inherited
- // if (lock_file(LOCKFILE)) {
- // log_messages.printf(SCHED_MSG_LOG::NORMAL, "Another copy of assimilator is already running\n");
- // exit(1);
- // }
- // write_pid_file(PIDFILE);
log_messages.printf(SCHED_MSG_LOG::NORMAL, "Starting\n");
retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
diff --git a/sched/file_deleter.C b/sched/file_deleter.C
index 5495728729..8a49a620ae 100644
--- a/sched/file_deleter.C
+++ b/sched/file_deleter.C
@@ -562,12 +562,6 @@ int main(int argc, char** argv) {
}
}
- // // Call lock_file after fork(), because file locks are not always inherited
- // if (lock_file(LOCKFILE)) {
- // log_messages.printf(SCHED_MSG_LOG::NORMAL, "Another copy of file deleter is running\n");
- // exit(1);
- // }
- // write_pid_file(PIDFILE);
log_messages.printf(SCHED_MSG_LOG::NORMAL, "Starting\n");
retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
diff --git a/sched/make_work.C b/sched/make_work.C
index 6155a1a05b..5a98d2a75c 100644
--- a/sched/make_work.C
+++ b/sched/make_work.C
@@ -302,12 +302,6 @@ int main(int argc, char** argv) {
}
}
- // // Call lock_file after fork(), because file locks are not always inherited
- // if (lock_file(LOCKFILE)) {
- // log_messages.printf(SCHED_MSG_LOG::NORMAL, "Another copy of make_work is already running\n");
- // exit(1);
- // }
- // write_pid_file(PIDFILE);
log_messages.printf(
SCHED_MSG_LOG::NORMAL,
"Starting: cushion %d, max_wus %d\n",
diff --git a/sched/transitioner.C b/sched/transitioner.C
index 39ed682c7a..394da94af9 100644
--- a/sched/transitioner.C
+++ b/sched/transitioner.C
@@ -642,12 +642,6 @@ int main(int argc, char** argv) {
}
}
- // // Call lock_file after fork(), because file locks are not always inherited
- // if (lock_file(LOCKFILE)) {
- // log_messages.printf(SCHED_MSG_LOG::NORMAL, "Another copy of transitioner is already running\n");
- // exit(1);
- // }
- // write_pid_file(PIDFILE);
log_messages.printf(SCHED_MSG_LOG::NORMAL, "Starting\n");
install_stop_signal_handler();
diff --git a/sched/update_stats.C b/sched/update_stats.C
index eb9925e4c7..63d057699c 100644
--- a/sched/update_stats.C
+++ b/sched/update_stats.C
@@ -175,12 +175,6 @@ int main(int argc, char** argv) {
}
}
- // // Call lock_file after fork(), because file locks are not always inherited
- // if (lock_file(LOCKFILE)) {
- // log_messages.printf(SCHED_MSG_LOG::NORMAL, "Another copy of update_stats is already running\n");
- // exit(1);
- // }
- // write_pid_file(PIDFILE);
log_messages.printf(SCHED_MSG_LOG::NORMAL, "Starting\n");
|