*** empty log message ***

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

checkin_notes

@@ -8894,3 +8894,12 @@ David  15 Aug 2006
         gui_rpc_client_ops.C
     sched/
         sched_hr.C
+
+David  16 Aug 2006
+    - GUI RPC: set_global_prefs_override(): if arg is empty string,
+        delete prefs override file
+    - improved comments in CPU sched code
+
+    client/
+        cs_scheduler.C
+        gui_rpc_server_ops.C

client/cs_scheduler.C

@@ -549,6 +549,16 @@ double CLIENT_STATE::time_until_work_done(
 // - for each contactable project:
 //     - work_request and work_request_urgency
 //
+// Notes:
+// - at most 1 CPU-intensive project will have a nonzero work_request
+//      and a work_request_urgency higher than DONT_NEED.
+//      This prevents projects with low LTD from getting work
+//      even though there was a higher LTD project that should get work.
+// - all non-CPU-intensive projects that need work
+//      and are contactable will have a work request of 1.
+//
+// return false
+//
 bool CLIENT_STATE::compute_work_requests() {
     bool non_cpu_intensive_needs_work=false;
     unsigned int i;

client/gui_rpc_server_ops.C

@@ -796,13 +796,17 @@ static void handle_set_global_prefs_override(char* buf, MIOFILE& fout) {
     if (q) {
         *q = 0;
         strip_whitespace(p);
-        FILE* f = boinc_fopen(GLOBAL_PREFS_OVERRIDE_FILE, "w");
-        if (f) {
-            fprintf(f, "%s\n", p);
-            fclose(f);
-            retval = 0;
+        if (strlen(p)) {
+            FILE* f = boinc_fopen(GLOBAL_PREFS_OVERRIDE_FILE, "w");
+            if (f) {
+                fprintf(f, "%s\n", p);
+                fclose(f);
+                retval = 0;
+            } else {
+                retval = ERR_FOPEN;
+            }
         } else {
-            retval = ERR_FOPEN;
+            retval = boinc_delete_file(GLOBAL_PREFS_OVERRIDE_FILE);
         }
     }
     fout.printf(

doc/boinc_news.inc

@@ -1,6 +1,12 @@
 <?
 
 $project_news = array(
+array("August 16, 2006",
+    "New documents discuss using BOINC for
+    <a href=dg.php>Desktop Grid Computing</a>
+    and for creating
+    <a href=vcsc.php>Virtual Campus Supercomputing Centers</a>."
+),
 array("August 15, 2006",
     "A BBC Radio program on 'Citizen Science' - including
     a segment on volunteer computing and BOINC -

doc/gui_rpc.php

@@ -276,14 +276,33 @@ list_item_func(
 );
 list_item_func(
     "get_global_prefs_override(std::string&)",
-    "Return the contents of the
-    <a href=prefs_override.php>global preferences override file</a>."
+    "Reads the contents of the
+    <a href=prefs_override.php>global preferences override file</a>
+    into the given string.
+    Return an error code if the file is not present."
 );
 list_item_func(
     "set_global_prefs_override(std::string&)",
     "Write the given contents to the
+    <a href=prefs_override.php>global preferences override file</a>.
+    If the argment is an empty string, delete the file.
+    Otherwise the argument must be a valid
+    &lt;global_preferences&gt; element."
+);
+list_item_func(
+    "get_global_prefs_override_struct(GLOBAL_PREFS&)",
+    "Return the contents of the
+    <a href=prefs_override.php>global preferences override file</a>,
+    parsed into a structure.
+    Default values are zero.
+    Returns an error code if the file is not present."
+);
+list_item_func(
+    "set_global_prefs_override_struct(GLOBAL_PREFS&)",
+    "Convert the given structure to XML and write it to the
     <a href=prefs_override.php>global preferences override file</a>."
 );
+
 list_end();
 echo "
 <p>

doc/index.php

@@ -6,8 +6,9 @@ function show_participant() {
     $i = rand(0, 99);
     $j = $i+1;
     echo "
-        <tr><td align=middle>
-        <hr width=70%>
+        <tr><td>
+        <center>
+        <table border=2 cellpadding=6><tr><td>
     ";
     include("piecharts/$i.html");
     echo "
@@ -17,6 +18,7 @@ function show_participant() {
         <a href=http://boinc.netsoft-online.com/rankings.php?list=r_p_1_e><b>Single-computer</a> |
         <a href=http://boinc.netsoft-online.com/rankings.php><b>Other lists</a>
         </center>
+        </td></tr></table>
         </td></tr>
     ";
 }
@@ -77,21 +79,26 @@ function show_participate() {
 function show_create() {
     global $light_blue;
     echo "
-        <tr><td bgcolor=$light_blue><font size=4>Create a volunteer computing project</font></td></tr>
+        <tr><td bgcolor=$light_blue><font size=4>Compute with BOINC</font></td></tr>
         <tr><td>
-        If you are a scientist with a computationally-intensive task,
-        you may be able to use BOINC.
         A BOINC project with a single Linux server
         can provide computing power equivalent
         to a cluster with tens of thousands of CPUs.
-        <p>
         Learn how to <a href=create_project.php><b>create
         and operate a BOINC project</b></a>.
-        <p>
-        If you lack the resources to operate a BOINC project directly,
-        organizations such as World Community Grid may be able
-        to assist you.
+        <ul>
+        <li> <b>Scientists</b>: if your group has moderate
+        programming, web, sysadmin, and hardware resources,
+        you can create your own BOINC project.
+        Otherwise, organizations such as World Community Grid may be able
+        to host your project.
         Please <a href=contact.php>contact us</a> for information.
+        <li> <b>Universities</b>: create a
+            <a href=vcsc.php>Virtual Campus Supercomputing Center</a> (VCSC)
+            using BOINC.
+        <li> <b>Companies</b>:
+            use BOINC for <a href=dg.php>Desktop Grid Computing</a>.
+        </ul>
         </td></tr>
     ";
 }
@@ -146,8 +153,8 @@ echo "
 <h1>
 Berkeley Open Infrastructure for Network Computing
 </h1>
-BOINC is free, open-source software for
-<a href=volunteer.php>volunteer computing</a> and desktop grid computing.
+Open-source software for
+<a href=volunteer.php>volunteer computing</a> and <a href=dg.php>desktop grid computing</a>.
 <p>
 ";
 search_form();

doc/projects.php

@@ -35,8 +35,7 @@ and copy the URL from your browser's address field.
 
 <p>
 Projects are independent.
-The BOINC project has no control over the creation of BOINC-based projects,
-and do not endorse them.
+BOINC does not control or endorse BOINC-based projects.
 When you participate in a project,
 you entrust that project with the health of your
 computer and the privacy of your data.

doc/volunteer.php

@@ -100,7 +100,7 @@ This is different from volunteer computing.
 'Desktop grid' computing - which uses desktop PCs within an organization -
 is superficially similar to volunteer computing,
 but because it has accountability and lacks anonymity,
-it is different at a deeper level.
+it is significantly different.
 <p>
 If your definition of 'Grid computing' encompasses all distributed computing
 (which is silly - there's already a perfectly good term for that)