Changeset 28138

Timestamp:

May 27, 2010, 10:51:54 AM (16 years ago)

Author:

Paul Price

Message:

Reworking the locks because something still seems to be sneaking through every now and then.

File:

• trunk/psLib/src/sys/psThread.c (modified) (9 diffs)

trunk/psLib/src/sys/psThread.c

@@ -121 +121 @@
     }
 
+    psThreadLock();
     psThreadJob *job = psListGetAndRemove(pending, PS_LIST_HEAD);
+    psThreadUnlock();
     return job;
 }
@@ -132 +134 @@
     }
 
+    psThreadLock();
     psThreadJob *job = psListGetAndRemove(done, PS_LIST_HEAD);
+    psThreadUnlock();
     return job;
 }
@@ -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
-        psThreadLock();
         psThreadJob *job = NULL;        // Job to process
         while ((job = psThreadJobGetPending()) == NULL) {
-            psThreadUnlock();
             usleep(THREAD_WAIT);
-            psThreadLock(); // XXX ???
         }
         self->busy = true;
 
         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);
@@ -216 +215 @@
         psListAdd(done, PS_LIST_TAIL, job);
         psFree(job);
+        psThreadUnlock();
 
         if (!status) {
@@ -221 +221 @@
         }
         self->busy = false;
-        psThreadUnlock();
     }
 }
@@ -257 +256 @@
 static void psThreadJobHarvest(void)
 {
-    psThreadLock();
     psThreadJob *job;           // Job from done queue
     while ((job = psThreadJobGetDone())) {
         psFree(job);
     }
-    psThreadUnlock();
     return;
 }
@@ -287 +284 @@
         }
 
-        // Harvest jobs, if requested
+        // Harvest jobs in the background, if requested
         if (harvest) {
             psThreadJobHarvest();
         }
 
+#if 0 // Thread state doesn't matter, only the pending job queue
         // are all threads idle?
-        psThreadLock();
         for (int i = 0; i < pool->n; i++) {
             psThread *thread = pool->data[i];
@@ -301 +298 @@
             }
         }
-
-        if (!pending || !pending->head) {
+#endif
+
+        psThreadLock();
+        bool more = (pending && pending->head) ? true : false; // More to process?
+        psThreadUnlock();
+
+        if (!more) {
             // Nothing in the queue
-            psThreadUnlock();
             // Ensure everything is harvested, if requested
             if (harvest) {
@@ -312 +313 @@
         }
 
-    SLEEP:
-        psThreadUnlock();
         usleep(THREAD_WAIT);
     }