Changeset 28304 for branches/czw_branch/20100519/psLib/src/sys/psThread.c

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

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

branches/czw_branch/20100519/psLib/src/sys/psThread.c

@@ -21 +21 @@
 #define TASK_BUCKETS 8                  // Number of hash buckets for task list
 
+// Mutex covers:
+// * pending queue
+// * done queue
+// * thread->busy states
 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
@@ -28 +33 @@
 static psArray *tsd = NULL;             // Thread-specific data
 
-
 /***** basic thread functions *****/
 
@@ -193 +197 @@
         // request a new job, if there are none available, sleep a bit
         // we have to lock here so the job queue cannot be empty yet no threads busy
+        psThreadJob *job = NULL;        // Job to process
         psThreadLock();
-        psThreadJob *job = NULL;        // Job to process
         while ((job = psThreadJobGetPending()) == NULL) {
+            // Unlock while sleeping, then lock to read the pending queue again
             psThreadUnlock();
             usleep(THREAD_WAIT);
-            psThreadLock(); // XXX ???
+            psThreadLock();
         }
         self->busy = true;
+        psThreadUnlock();
 
         psThreadTask *task = psHashLookup(tasks, job->type); // Task to execute job
-        psThreadUnlock();
-
         psAssert(task, "Couldn't find thread task %s", job->type);
         psAssert(job->args->n == task->nArgs, "invalid number of arguments to %s (%ld supplied, expected %d)", task->type, job->args->n, task->nArgs);
@@ -254 +258 @@
 }
 
-// Harvest jobs from the
+// Harvest jobs from the done list
 static void psThreadJobHarvest(void)
 {
-    psThreadLock();
     psThreadJob *job;           // Job from done queue
     while ((job = psThreadJobGetDone())) {
         psFree(job);
     }
-    psThreadUnlock();
     return;
 }
@@ -273 +275 @@
         // Ensure everything is harvested, if requested
         if (harvest) {
+            // No threads, no no need to lock
             psThreadJobHarvest();
         }
@@ -287 +290 @@
         }
 
-        // Harvest jobs, if requested
+        psThreadLock();
+
+        // Harvest jobs in the background, if requested
         if (harvest) {
             psThreadJobHarvest();
@@ -293 +298 @@
 
         // are all threads idle?
-        psThreadLock();
         for (int i = 0; i < pool->n; i++) {
             psThread *thread = pool->data[i];
@@ -303 +307 @@
 
         if (!pending || !pending->head) {
-            // Nothing in the queue
-            psThreadUnlock();
+            // Nothing in the queue and nothing more to add
             // Ensure everything is harvested, if requested
             if (harvest) {
                 psThreadJobHarvest();
             }
+            psThreadUnlock();
             return true;
         }