show app versions as single ints

svn path=/trunk/boinc/; revision=7734

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

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);
 

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

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*);

doc/boinc_dev.php

@@ -3,27 +3,35 @@ require_once("docutil.php");
 page_head("Development and debugging");
 
 echo "
-<p>
-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 <a href=participate.php>participants</a>
-and <a href=create_project.php>projects</a>)
-before getting into the source code.
 
 <p>
-Check out the following:
 <ul>
-<li> <a href=dev_flow.php>Development information flow</a>.
+<li> <a href=contact.php>Project personnel and structure</a>
+<li> <a href=dev_flow.php>BOINC Development information flow</a>.
 <li> The <a href=http://bbugs.axpr.net/index.php>BOINCzilla bug database</a>.
 <li> <a href=email_lists.php>boinc_dev</a>,
 an email list for BOINC developers.
 <li> <a href=compile.php>Get and compile BOINC software</a>
 <li> <a href=coding.php>BOINC coding style</a>
 </ul>
+<h2>Getting involved</h2>
+<p>
+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 <a href=participate.php>participants</a>
+and <a href=create_project.php>projects</a>)
+before getting into the source code.
 
+<p>
+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:
 <ul>
 <li> BOINC Manager:

doc/contact.php

@@ -84,9 +84,9 @@ Each area is managed by an 'owner'.
 </tr>
 </table>
 
-<h2>Contributors</h2>
+<h2>Developers</h2>
-The following people have contributed to
+The following people have contributed to the development of
-the development of BOINC:
+the BOINC software:
 <p>
 ";
 $i = 0;
@@ -164,8 +164,9 @@ show_name("Oliver Wang");
 show_name("Frank Weiler");
 echo "
 </table>
+<h2>Testers</h2>
 <p>
-BOINC testers include:
+BOINC alpha testers include:
 <p>
 ";
 $i = 0;

doc/dev_flow.php

@@ -26,7 +26,7 @@ BOINC message boards are <a href=dev/>here</a>.
 <li> Learn of new releases on the BOINC web site.
 <li> Note: we need ways of 'pushing' info to participants, e.g. via the Manager.
 </ul>
-<h3>Owners</h3>
+<h3>Area owners</h3>
 <ul>
 <li> Reads the relevant BOINC message board on a regular basis.
 Decides if new bugs are present.

doc/download_other.php

@@ -22,6 +22,16 @@ list_start();
 list_heading_array(array(
     "Site", "Platforms", "Programs available"
 ));
+list_item_array(array(
+    "<a href=http://naparst.name/>Harold Naparst</a>",
+    "Linux/x86",
+    "SETI@home application"
+));
+list_item_array(array(
+    "<a href=http://www.godefroy.t.freesurf.fr/seti/>SETI@home and BOINC on Linux</a>",
+    "Mandrake Linux",
+    "BOINC and SETI@home (graphical versions)"
+));
 list_item_array(array(
     "<a href=http://forums.macnn.com/showthread.php?t=266339>macnn.com</a>",
     "Mac OS X",

doc/index.php

@@ -17,8 +17,8 @@ echo "
 <center>
 <br>
 <h1>Berkeley Open Infrastructure for Network Computing</h1>
-A software platform for distributed computing using volunteered
+An open-source software platform for computing using volunteered
-computer resources
+resources
 <br>
 </center>
 
@@ -67,6 +67,16 @@ computer resources
     you ensure that your computer will be kept busy
     even when one project has no work.
     <p>
+    There are several Wikis
+    with user-editable information and documentation about BOINC:
+        <ul>
+        <li> <a href=http://boinc-doc.net/boinc-wiki/>The Unofficial BOINC Wiki</a> (in English)
+        <li> <a href=http://faq.boinc.de/>Deutsche BOINC FAQ</a> (in German)
+        <li> <a href=http://www.boincfrance.org/wakka.php?wiki=BienVenue>BOINCFrance.org</a> (in French)
+        </ul>
+    <p>
+    ... and many other <a href=links.php>web sites for BOINC participants</a>.
+    <p>
     <a href=participate.php>... more</a>
 
     <br><br>
@@ -75,7 +85,6 @@ computer resources
   <tr><td>
     If you're a scientist with a computationally-intensive task,
     you may be able to use BOINC.
-    <p>
     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
     </a>
     <br><br>
   </td></tr>
-  <tr><td bgcolor=$light_blue><h2>Other Info</h2></td></tr>
+  <tr><td bgcolor=$light_blue><h2>Other info</h2></td></tr>
   <tr><td>
     <ul>
     <li> <a href=contact.php>Personnel and contact info</a>
     <li> BOINC <a href=email_lists.php>email lists</a>
     <li> BOINC <a href=dev/>message boards</a>
     <li> An <a href=intro.php>overview of BOINC</a>, and links to papers
-    <li> Wikis (user-editable information and documentation):
+    <li> How to get involved in
-        <ul>
+      <ul>
-        <li> <a href=http://boinc-doc.net/boinc-wiki/>The Unofficial BOINC Wiki</a> (in English)
+      <li> <a href=boinc_dev.php>Software development and testing</a>
-        <li> <a href=http://faq.boinc.de/>Deutsche BOINC FAQ</a> (in German)
+      <li> <a href=translation.php>Translation</a> of web and GUI text.
-        <li> <a href=http://www.boincfrance.org/wakka.php?wiki=BienVenue>BOINCFrance.org</a> (in French)
+      </ul>
-        </ul>
-    <li> <a href=links.php>Web sites</a> for BOINC participants
-    <li>
-        <a href=boinc_dev.php>Software development</a>
-        <blockquote>
-        BOINC is free software,
-        distributed under the Lesser GNU Public License (LGPL).
-        If you are fluent in C++, PHP, SQL, and/or Python,
-        you may be able to help debug and enhance BOINC.
-        </blockquote>
-    <li>
-      Non-English <a href=translation.php>translations</a>
-      of project web sites and the BOINC manager.
     <li>
     <a href=logo.php>Logos and graphics</a>
     </ul>

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];

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);

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);

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",

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();

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");