*** empty log message ***

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

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) {

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

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) {
 //    <md5>$md</md5>
 }
 
-function is_dev($v) {
-    return (strstr($v["status"], "Development") != null);
-}
-
 function show_version($pname, $i, $v) {
     global $url_base;
     $num = $v["num"];

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(

doc/versions.inc

@@ -35,7 +35,8 @@ $features_55 = "
     <li> New CPU Scheduler.
     <li> CPU Capability detection.
     <li> Revamped logging solution.
-    <li> Improved security for posix compliant systems. (Right now only 
+    <li> Improved security for POSIX compliant systems
+        (only 
          implemented for the Mac)
     <li> 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;
+}
+
 ?>

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 <je2bwm@jarl.com>\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 <a href=poll.php>BOINC user survey</a>.  This page is updated every hour."
+msgid "POLL_RESULTS_TEXT"
+msgstr "以下は <a href=poll.php>BOINC 参加者サーベイ</a> の現時点での結果です。このページは1時間ごとに更新されます。"