*** empty log message ***

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

checkin_notes

@@ -8388,3 +8388,11 @@ Rom    2 Aug 2006
 
     clientgui/
         AdvancedFrame.cpp
+
+David  3 Aug 2006
+    - Don't run benchmarks at startup when user has <max_cpus>
+        in global prefs override
+
+    client/
+        client_state.C,h
+        cs_apps.C

client/client_state.C

@@ -111,6 +111,7 @@ CLIENT_STATE::CLIENT_STATE() {
 #else
     g_use_sandbox = false;
 #endif
+    initialized = false;
 }
 
 void CLIENT_STATE::show_host_info() {
@@ -328,6 +329,7 @@ int CLIENT_STATE::init() {
 
     check_file_existence();
 
+    initialized = true;
     return 0;
 }
 

client/client_state.h

@@ -169,6 +169,7 @@ public:
     bool detach_console;
     double now;
     const char* platform_name;
+    bool initialized;
 
 private:
     bool client_state_dirty;

client/cs_apps.C

@@ -286,6 +286,9 @@ double CLIENT_STATE::nearly_runnable_resource_share() {
     return x;
 }
 
+// called at startup (after get_host_info())
+// and when general prefs have been parsed
+//
 void CLIENT_STATE::set_ncpus() {
     int ncpus_old = ncpus;
 
@@ -298,9 +301,10 @@ void CLIENT_STATE::set_ncpus() {
     }
     if (ncpus > global_prefs.max_cpus) ncpus = global_prefs.max_cpus;
 
-    if (ncpus_old && ncpus != ncpus_old) {
+    if (initialized && ncpus != ncpus_old) {
         msg_printf(0, MSG_INFO,
-            "Number of usable CPUs has changed.  Running benchmarks."
+            "Number of usable CPUs has changed from %d to %d.  Running benchmarks.",
+            ncpus_old, ncpus
         );
         run_cpu_benchmarks = true;
         request_schedule_cpus("Number of usable CPUs has changed");

doc/client_msgs.php

@@ -35,9 +35,11 @@ list_item_func("<dont_check_file_sizes>",
     Use it if you need to modify files locally for some reason."
 ); 
 list_item_func("<ncpus>",
-    "Act as if there were N CPUs,
-    i.e. run N tasks at once (for debugging only;
-    may cause you to miss deadlines)."
+    "Act as if there were N CPUs: run N tasks at once.
+    This is for debugging, i.e. to simulate 2 CPUs
+    on a machine that has only 1.
+    Don't use it to limit the number of CPUs used by BOINC;
+    use general preferences instead.
 );
 list_end();
 echo "

doc/download.php

@@ -41,7 +41,7 @@ function link_row($pname) {
     } else if ($pname=='mac') {
         echo "<img src=images/ico-osx-uni.png> <b>Mac OS X</b>";
     } else if ($pname=='linux') {
-        echo "<img src=images/ico-tux.png> <b>Linux</b>";
+        echo "<img src=images/ico-tux.png> <b>Linux/x86</b>";
     }
     echo "</td><td>";
     echo download_link($pname);
@@ -49,10 +49,35 @@ function link_row($pname) {
     ";
 }
 
+$apps = array(
+    array('classic.jpg', 180, 143),
+    array('cpdn_200.jpg', 200, 147),
+    array('eah_200.png', 200, 150),
+);
+
+function show_pictures() {
+    global $apps;
+    shuffle($apps);
+    $a0 = $apps[0];
+    $a1 = $apps[1];
+    $f0 = $a0[0];
+    $f1 = $a1[0];
+    echo "
+        <div style=\"max-height: 300px\">
+        <img src=images/mgrwork.png><br>
+        <div style=\"position:relative; top:-80px; left:30px\">
+            <img src=images/$f0><br>
+        </div>
+        <div style=\"position:relative; top:-160px; left:70px\">
+            <img src=images/$f1><br>
+        </div>
+        </div>
+    ";
+}
+
 function show_download($pname) {
     echo "
-        <table cellpadding=30><tr><td>
-        <img valign=top hspace=8 align=right src=images/boinc_screen.png>
+        <table cellpadding=10><tr><td valign=top>
         BOINC is a program that lets you donate
         your idle computer time to science projects like
         SETI@home, Climateprediction.net, Rosetta@home,
@@ -75,14 +100,14 @@ function show_download($pname) {
     }
     echo "
         <p>
-        <a href=system_requirements.php>System requirements</a>
-        | <a href=release_notes.php>Release notes</a>
+        <a href=system_requirements.php><nobr>System requirements</nobr></a>
+        | <a href=release_notes.php><nobr>Release notes</nobr></a>
     ";
     if ($pname) {
-        echo " | <a href=download.php?all_platforms=1>Other systems</a>
+        echo " | <a href=download.php?all_platforms=1><nobr>Other systems</nobr></a>
         ";
     } else {
-        echo " | <a href=download_all.php>All versions</a>
+        echo " | <a href=download_all.php></nobr>All versions</nobr></a>
         <p>
         If your computer is not of one of the above types, you can
         <ul>
@@ -92,7 +117,23 @@ function show_download($pname) {
         </ul>
         ";
     }
-    echo " </td></tr></table>
+    echo "
+        <p>
+        </td><td valign=top>
+    ";
+    show_pictures();
+    echo "
+        </td>
+        </tr></table>
+        <hr>
+        <font size=-2>
+        Note: files are downloaded from mirror servers
+        at boinc.berkeley.edu, morel.mit.edu, einstein.aei.mpg.de,
+        einstein.astro.gla.ac.uk, and einstein.aset.psu.edu
+        (thanks to these institutions).
+        The server is chosen randomly -
+        if a download fails, reload this page and try again.
+        </font>
     ";
 }
 

doc/versions.inc

@@ -707,30 +707,6 @@ $l443 = array(
     "
 );
 
-$l419 = array(
-    "num"=>"4.19",
-    "status"=>"Older version",
-    "file"=>"boinc_4.19_i686-pc-linux-gnu.gz",
-    "date"=>"25 Jan 2005",
-    "type"=>"bare_core",
-);
-
-$s419 = array(
-    "num"=>"4.19",
-    "status"=>"Older version",
-    "file"=>"boinc_4.19_sparc-sun-solaris2.7.gz",
-    "date"=>"25 Jan 2005",
-    "type"=>"bare_core",
-);
-
-$s443 = array(
-    "num"=>"4.43",
-    "status"=>"Recommended version",
-    "file"=>"boinc_4.43_sparc-sun-solaris2.7.sh",
-    "date"=>"26 May 2005",
-    "type"=>"sea",
-);
-
 $windows = array(
     "name"=>"Windows",
     "dbname" => "windows_intelx86",
@@ -766,21 +742,11 @@ $linux = array(
         $l443,
     )
 );
-$solaris = array(
-    "name"=>"Solaris/SPARC",
-    "dbname" => "sparc-sun-solaris2.7",
-    "url"=>"solaris.php",
-    "versions"=>array(
-        $s443,
-        $s419,
-    )
-);
 
 $platforms = array(
     "win"=>$windows,
     "mac"=>$mac,
     "linux"=>$linux,
-    "solaris"=>$solaris
 );
 
 function is_dev($v) {