Changeset 33415 for branches/meh_branches/ppstack_test/psLib/src/sys/psThread.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psLib/src/sys/psThread.c (modified) (15 diffs)

branches/meh_branches/ppstack_test/psLib/src/sys/psThread.c

@@ -36 +36 @@
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; // Mutex for locking threads
 
-static psList *pending = NULL;          // queue of pending jobs
-static psList *done = NULL;             // queue of done jobs
+static volatile psList *pending = NULL; // queue of pending jobs
+static volatile psList *done = NULL;    // queue of done jobs
 static pthread_t *threads = NULL;       // array of the POSIX thread handles
 static psArray *pool = NULL;            // array of defined threads
@@ -91 +91 @@
 
     job->type = psStringCopy(type);
-    job->args = psArrayAlloc(0);
+    job->args = psArrayAllocEmpty(16);
     job->results = NULL;
     return job;
@@ -116 +116 @@
             done = psListAlloc(NULL);
         }
-        psListAdd(done, PS_LIST_TAIL, job);
+        psListAdd((psList *)done, PS_LIST_TAIL, job);
         psFree(job);
         return task->function(job);
@@ -125 +125 @@
         pending = psListAlloc(NULL);
     }
-    psListAdd(pending, PS_LIST_TAIL, job);
+    psListAdd((psList *)pending, PS_LIST_TAIL, job);
     psFree(job);
     psThreadUnlock();
@@ -139 +139 @@
     }
 
-    psThreadJob *job = psListGetAndRemove(pending, PS_LIST_HEAD);
+    psThreadJob *job = psListGetAndRemove((psList *)pending, PS_LIST_HEAD);
     return job;
 }
@@ -150 +150 @@
     }
 
-    psThreadJob *job = psListGetAndRemove(done, PS_LIST_HEAD);
+    psThreadJob *job = psListGetAndRemove((psList *) done, PS_LIST_HEAD);
     return job;
 }
@@ -179 +179 @@
     PS_ASSERT_THREAD_TASK_NON_NULL(task, false);
 
+    // fprintf(stderr, "adding task %s\n", task->type);
+
     if (!tasks) {
         tasks = psHashAlloc(TASK_BUCKETS);
@@ -189 +191 @@
 {
     PS_ASSERT_STRING_NON_EMPTY(type, false);
+    // fprintf(stderr, "removing task %s\n", type);
 
     return psHashRemove(tasks, type);
@@ -223 +226 @@
 
         psThreadTask *task = psHashLookup(tasks, job->type); // Task to execute job
+        // fprintf(stderr, "launching job %s\n", job->type);
 #ifdef HAVE_BACKTRACE
         if (!task && bt_buffer) {
@@ -246 +250 @@
                  "invalid number of arguments to %s (%ld supplied, expected %d)",
                  task->type, job->args->n, task->nArgs);
+        // fprintf(stderr, "    thread for %s %p launching on %p\n", job->type, task->function, self);
+
+        // Run the job's function
         bool status = task->function(job); // Status of executing task
+
+        // fprintf(stderr, "    thread for %s %p finished on %p with status %d\n", job->type, task->function, self, status);
 
         // Put the completed job on the 'done' queue
@@ -253 +262 @@
             done = psListAlloc(NULL);
         }
-        psListAdd(done, PS_LIST_TAIL, job);
+        psListAdd((psList *)done, PS_LIST_TAIL, job);
         psFree(job);
 
@@ -306 +315 @@
 
 // call this function after you have added jobs to the queue and
-bool psThreadPoolWait(bool harvest)
-{
+bool psThreadPoolWait(bool harvest, bool harvestOnFailure)
+{
+    // fprintf(stderr, "psThreadPoolWait called with harvest: %d\n", harvest);
     if (!pool || pool->n == 0) {
         // No threads initialised, so everything's done
@@ -326 +336 @@
 #endif
 
+    // accumulate the number of faulted jobs that we encounter
+    int numFaults = 0;
     while (1) {
         // check for an error
@@ -331 +343 @@
             psThread *thread = pool->data[i];
             if (thread->fault) {
-                return false;
+                numFaults++;
             }
         }
@@ -354 +366 @@
             // Nothing in the queue and nothing more to add
             // Ensure everything is harvested, if requested
-            if (harvest) {
+            if (harvest || (numFaults && harvestOnFailure)) {
                 psThreadJobHarvest();
             }
             psThreadUnlock();
-            return true;
+            return numFaults == 0;
         }