From 4a286e54c9dc659ce27e1137fc67be738e88d57a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 1 Aug 2006 21:22:25 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10808 --- api/boinc_api.C | 17 +++++++---------- checkin_notes | 6 ++++++ doc/download.php | 16 ---------------- doc/links.php | 1 + doc/versions.inc | 18 ++++++++++++++++-- languages/translations/ja.po | 15 +++++++++++---- 6 files changed, 41 insertions(+), 32 deletions(-) diff --git a/api/boinc_api.C b/api/boinc_api.C index ddb2b42c25..7ce83b99a6 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -192,11 +192,11 @@ static int boinc_worker_thread_cpu_time(double& cpu) { } #else if (!pthread_mutex_lock(&getrusage_mutex)) { - cpu = (double)worker_thread_ru.ru_utime.tv_sec - + (((double)worker_thread_ru.ru_utime.tv_usec)/1000000.0); - cpu += (double)worker_thread_ru.ru_stime.tv_sec - + (((double)worker_thread_ru.ru_stime.tv_usec)/1000000.0); - pthread_mutex_unlock(&getrusage_mutex); + cpu = (double)worker_thread_ru.ru_utime.tv_sec + + (((double)worker_thread_ru.ru_utime.tv_usec)/1000000.0); + cpu += (double)worker_thread_ru.ru_stime.tv_sec + + (((double)worker_thread_ru.ru_stime.tv_usec)/1000000.0); + pthread_mutex_unlock(&getrusage_mutex); } #endif double cpu_diff = cpu - last_cpu; @@ -789,12 +789,9 @@ void* timer_thread(void*) { } void worker_signal_handler(int) { -// getrusage can return an error, so try a few times if it returns an error. -// but don't hang around if you can't get the mutex if (!pthread_mutex_trylock(&getrusage_mutex)) { - int i=0; - while (getrusage(RUSAGE_SELF, &worker_thread_ru) && i<10) i++; - pthread_mutex_unlock(&getrusage_mutex); + getrusage(RUSAGE_SELF, &worker_thread_ru); + pthread_mutex_unlock(&getrusage_mutex); } if (options.direct_process_action) { while (boinc_status.suspended) { diff --git a/checkin_notes b/checkin_notes index 1156271861..c265db6b27 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8258,3 +8258,9 @@ Rom 1 Aug 2006 clientgui/msw/ taskbarex.cpp + +David 1 Aug 2006 + - API: don't repeatedly call getrusage() in worker_signal_handler(). + + api/ + boinc_api.C diff --git a/doc/download.php b/doc/download.php index 1217c1c9da..0c6b31a714 100755 --- a/doc/download.php +++ b/doc/download.php @@ -22,18 +22,6 @@ $type_name = $_GET["type"]; require_once("versions.inc"); -$url_base = "http://boinc.berkeley.edu/dl/"; -// $url_base = "http://boinc2.ssl.berkeley.edu/boinc/dl/"; - -switch(rand(0,4)) { - case 0: $url_base = "http://boinc.berkeley.edu/dl/"; break; - case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break; - case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break; - case 3: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break; - case 4: $url_base = "http://einstein.aset.psu.edu/download/boinc/dl/"; break; - //case 5: $url_base = "http://einstein.phys.uwm.edu/download/boinc/dl/"; break; -} - if ($dev) { $url_base = "dl/"; } @@ -112,10 +100,6 @@ function show_version_xml($v, $p) { // $md } -function is_dev($v) { - return (strstr($v["status"], "Development") != null); -} - function show_version($pname, $i, $v) { global $url_base; $num = $v["num"]; diff --git a/doc/links.php b/doc/links.php index 2920e1fbd8..30a1d1e958 100644 --- a/doc/links.php +++ b/doc/links.php @@ -104,6 +104,7 @@ language("English", array( site("http://www.setiusa.net/", "SETI.USA"), site("http://www.boincsynergy.com/", "BOINC Synergy"), site("http://www.esea.dk/esea/boinc.asp", "Earth Space Exploration Agency"), + site("http://www.tswb.org", "Team Starfire World BOINC"), //site("http://www.geocities.com/boinc_volunteers/", "BOINC Volunteers") )); language("Estonian", array( diff --git a/doc/versions.inc b/doc/versions.inc index c8d03945cb..96b5cf5aad 100644 --- a/doc/versions.inc +++ b/doc/versions.inc @@ -35,7 +35,8 @@ $features_55 = "
  • New CPU Scheduler.
  • CPU Capability detection.
  • Revamped logging solution. -
  • Improved security for posix compliant systems. (Right now only +
  • Improved security for POSIX compliant systems + (only implemented for the Mac)
  • Add support for file compression on upload. "; @@ -882,7 +883,7 @@ $windows = array( ) ); $mac = array( - "name"=>"Macintosh OS X (10.3 or higher)", + "name"=>"Mac OS X", "dbname" => "powerpc-apple-darwin", "versions"=>array( $m559, @@ -925,4 +926,17 @@ $platforms = array( "solaris"=>$solaris ); +function is_dev($v) { + return (strstr($v["status"], "Development") != null); +} + +switch(rand(0,4)) { + case 0: $url_base = "http://boinc.berkeley.edu/dl/"; break; + case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break; + case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break; + case 3: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break; + case 4: $url_base = "http://einstein.aset.psu.edu/download/boinc/dl/"; break; + //case 5: $url_base = "http://einstein.phys.uwm.edu/download/boinc/dl/"; break; +} + ?> diff --git a/languages/translations/ja.po b/languages/translations/ja.po index 85cf27c9f4..ddc48f6eed 100644 --- a/languages/translations/ja.po +++ b/languages/translations/ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2006-07-25 21:27+0900\n" +"PO-Revision-Date: 2006-08-02 02:00+0900\n" "Last-Translator: JE2BWM \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -11,7 +11,7 @@ msgstr "" ######################################### # Language: Japanese -# FileID : ja.po,v 1.1, based on en.po v1.3(cvs). 2006/07/25 20:20 JST je2bwm +# FileID : ja.po,v 1.2, based on en.po v1.5(cvs). 2006/08/02 JST je2bwm # Author : Janus Kristensen ( Translator: Komori Hitoshi ) # Email : jbk@visualgroup.dk( je2bwm at jarl.com ) ########################################## @@ -510,6 +510,13 @@ msgstr "" "BOINC 参加者サーベイにご協力ありがとうございました。\n" " " -msgid "POLL_" -msgstr "" +# msgid "POLL_RESULTS_TITLE" +# msgstr "Survey results" +msgid "POLL_RESULTS_TITLE" +msgstr "サーベイの結果" + +# msgid "POLL_RESULTS_TEXT" +# msgstr "These are the current results of the BOINC user survey. This page is updated every hour." +msgid "POLL_RESULTS_TEXT" +msgstr "以下は BOINC 参加者サーベイ の現時点での結果です。このページは1時間ごとに更新されます。"