From c1f9461305541a7d6796cef22ea544c767df56da Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 22 May 2005 23:00:35 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=6218
---
 api/boinc_api.C     | 38 ++++++++++++++++++++++----------------
 api/graphics_impl.C |  2 +-
 checkin_notes       | 20 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/api/boinc_api.C b/api/boinc_api.C
index 9f0f47b2de..b948ebe09a 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -56,7 +56,12 @@ using namespace std;
 // Unless otherwise noted, "CPU time" refers to the sum over all episodes
 // (not counting the part after the last checkpoint in an episode).
 
-static pthread_t timer_thread_handle;
+#ifndef _WIN32
+static pthread_t timer_thread;
+extern pthread_t worker_thread;
+#endif
+static double worker_thread_cpu_time=0;
+
 static APP_INIT_DATA aid;
 static FILE_LOCK file_lock;
 APP_CLIENT_SHM* app_client_shm = 0;
@@ -141,9 +146,7 @@ static int boinc_worker_thread_cpu_time(double& cpu) {
     }
     return 0;
 #else
-    // no CPU time calls in pthreads - return process total
-    //
-    return boinc_calling_thread_cpu_time(cpu);
+    cpu = worker_thread_cpu_time;
 #endif
 }
 
@@ -528,6 +531,15 @@ static void handle_process_control_msg() {
     }
 }
 
+#ifndef _WIN32
+static void timer_signal_handler(int) {
+    if (pthread_equal(pthread_self(), worker_thread)) {
+        int retval = boinc_calling_thread_cpu_time(worker_thread_cpu_time);
+    }
+}
+
+#endif
+
 #ifdef _WIN32
 static void CALLBACK worker_timer(
     UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2
@@ -639,15 +651,13 @@ int set_worker_timer() {
     //
     SetThreadPriority(worker_thread_handle, THREAD_PRIORITY_IDLE);
 #else
-#if 1
-    retval = pthread_create(&timer_thread_handle, NULL, timer_thread, NULL);
+    retval = pthread_create(&timer_thread, NULL, timer_thread, NULL);
     if (retval) {
         perror("set_worker_timer(): pthread_create(): %d");
     }
-#else
     struct sigaction sa;
     itimerval value;
-    sa.sa_handler = worker_timer;
+    sa.sa_handler = timer_signal_handler;
     sa.sa_flags = SA_RESTART;
     retval = sigaction(SIGALRM, &sa, NULL);
     if (retval) {
@@ -661,7 +671,6 @@ int set_worker_timer() {
     if (retval) {
         perror("boinc set_worker_timer() setitimer");
     }
-#endif
 #endif
     return retval;
 }
@@ -678,16 +687,13 @@ int boinc_send_trickle_up(char* variety, char* p) {
     return 0;
 }
 
-// logically this should be a bool.  But it need to be an int to be
-// compatible with C API.
+// logically this should be a bool.
+// But it needs to be an int to be compatible with C
+//
 int boinc_time_to_checkpoint() {
-
-    // If the application has received a quit request it should checkpoint
-    //
     if (ready_to_checkpoint) {
-      return 1;
+        return 1;
     }
-
     return 0;
 }
 
diff --git a/api/graphics_impl.C b/api/graphics_impl.C
index 95c9bd9335..44d3b52df9 100755
--- a/api/graphics_impl.C
+++ b/api/graphics_impl.C
@@ -136,7 +136,7 @@ int start_worker_thread(WORKER_FUNC_PTR _worker_main) {
     retval = pthread_attr_setschedparam(&worker_thread_attr, &param);
     if (retval) return ERR_THREAD;
 
-    // initialze thread-id of calling thread (which is the graphics-thread!)
+    // initialize ID of calling thread (the graphics-thread!)
     graphics_thread = pthread_self();
     
     retval = pthread_create(&worker_thread, &worker_thread_attr, foobar, 0);
diff --git a/checkin_notes b/checkin_notes
index 784954bb10..6b1988de09 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6892,3 +6892,23 @@ Charlie    22 may 2005
         postupgrade
         PostInstall.cpp
 
+David  22 May 2005
+    - debugged yesterday's API change on Linux.
+        It worked OK except CPU time wasn't getting reported.
+        It turns out that getrusage(), on Linux at least,
+        returns CPU time only for the calling thread
+        (in this case the timer thread,
+        whereas we wanted the worker thread).
+
+        So: put back a timer signal, but use it ONLY to get worker CPU time,
+        and only do that if the worker thread is the one handling the signal.
+        Store the worker CPU time in a variable (worker_thread_cpu_time)
+        which is read by the timer thread.
+
+        Aargh!!
+
+        Still need to make sure this works on Mac OS X, Solaris etc.
+
+    api/
+        boinc_api.C
+        graphics_impl.C