*** empty log message ***

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

checkin_notes

@@ -8511,3 +8511,10 @@ David  25 June 2005
         boinc_api.C
     sched/
         server_types.C
+
+David  25 June 2005
+    - Fix to PROJECT::set_rrsim_proc_rate()
+        (problem identified by John McLeod)
+
+    client/
+        cs_scheduler.C

client/cs_scheduler.C

@@ -985,12 +985,23 @@ bool CLIENT_STATE::should_get_work() {
 }
 
 void PROJECT::set_rrsim_proc_rate(double per_cpu_proc_rate, double rrs) {
-    if (active.size() == 0) return;
-    double x = 1;
-    if ((int)active.size() < gstate.ncpus) {
-        x = ((double)gstate.ncpus)/active.size();
+    int nactive = (int)active.size();
+    if (nactive == 0) return;
+    double x = resource_share/rrs;
+
+    // if this project has fewer active results than CPUs,
+    // scale up its share to reflect this
+    //
+    if (nactive < gstate.ncpus) {
+        x *= ((double)gstate.ncpus)/nactive;
     }
-    rrsim_proc_rate = x*per_cpu_proc_rate*resource_share/rrs;
+
+    // But its rate on a given CPU can't exceed the CPU speed
+    //
+    if (x>1) {
+        x = 1;
+    }
+    rrsim_proc_rate = x*per_cpu_proc_rate;
 }
 
 // return true if we don't have enough runnable tasks to keep all CPUs busy

doc/boinc_news.inc

@@ -2,6 +2,10 @@
 
 $project_news = array(
 
+array("June 25, 2005",
+    "BOINC statistics sites continue to evolve.
+    Check out <a href=http://home.btconnect.com/Gabys_Bazar/hwupgrade.html>Every Earthly Hour</a>, developed by Hydnum Repandum"
+),
 array("June 24, 2005",
     "We have added
     <a href=http://boinc.berkeley.edu/api.php#credit>new API calls</a>

doc/index.php

@@ -132,8 +132,9 @@ and do not necessarily reflect the views of the National Science Foundation.
 <h2>News</h2>
 </center>
 ";
-show_news($project_news, 6);
-if (count($project_news) > 6) {
+$nnews_items = 8;
+show_news($project_news, $nnews_items);
+if (count($project_news) > $nnews_items) {
     echo "<a href=old_news.php>... more</a>\n";
 }