From b340041cf508db7652df3d64cbbad9443b1d6646 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 3 Aug 2006 16:39:57 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10829 --- checkin_notes | 8 ++++++ client/client_state.C | 2 ++ client/client_state.h | 1 + client/cs_apps.C | 8 ++++-- doc/client_msgs.php | 8 +++--- doc/download.php | 57 +++++++++++++++++++++++++++++++++++++------ doc/versions.inc | 34 -------------------------- 7 files changed, 71 insertions(+), 47 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5c0a47b460..b6bab883a7 100755 --- a/checkin_notes +++ b/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 + in global prefs override + + client/ + client_state.C,h + cs_apps.C diff --git a/client/client_state.C b/client/client_state.C index 38a27917c8..d8d4b6b627 100644 --- a/client/client_state.C +++ b/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; } diff --git a/client/client_state.h b/client/client_state.h index 7971457fb0..e05d59cfab 100644 --- a/client/client_state.h +++ b/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; diff --git a/client/cs_apps.C b/client/cs_apps.C index 0739340e33..b298f1aa2f 100644 --- a/client/cs_apps.C +++ b/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"); diff --git a/doc/client_msgs.php b/doc/client_msgs.php index be3e73d6dd..ba0a2c4e7c 100644 --- a/doc/client_msgs.php +++ b/doc/client_msgs.php @@ -35,9 +35,11 @@ list_item_func("", Use it if you need to modify files locally for some reason." ); list_item_func("", - "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 " diff --git a/doc/download.php b/doc/download.php index 8006fa843b..8798114be4 100755 --- a/doc/download.php +++ b/doc/download.php @@ -41,7 +41,7 @@ function link_row($pname) { } else if ($pname=='mac') { echo " Mac OS X"; } else if ($pname=='linux') { - echo " Linux"; + echo " Linux/x86"; } echo ""; 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 " +
+
+
+
+
+
+
+
+
+ "; +} + function show_download($pname) { echo " - +
- +
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 "

- System requirements - | Release notes + System requirements + | Release notes "; if ($pname) { - echo " | Other systems + echo " | Other systems "; } else { - echo " | All versions + echo " | All versions

If your computer is not of one of the above types, you can

    @@ -92,7 +117,23 @@ function show_download($pname) {
"; } - echo "
+ echo " +

+

+ "; + show_pictures(); + echo " +
+
+ + 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. + "; } diff --git a/doc/versions.inc b/doc/versions.inc index ab09b9cd30..04c79700da 100644 --- a/doc/versions.inc +++ b/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) {