Changeset 28140 for trunk/psLib/src/sys/psThread.c

Timestamp:

May 27, 2010, 11:14:33 AM (16 years ago)

Author:

Paul Price

Message:

Reworking the locking again, now it's a bit clearer in my mind. Added rules on what needs to be locked.

File:

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

trunk/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 *****/
 
@@ -121 +125 @@
     }
 
-    psThreadLock();
     psThreadJob *job = psListGetAndRemove(pending, PS_LIST_HEAD);
-    psThreadUnlock();
     return job;
 }
@@ -134 +136 @@
     }
 
-    psThreadLock();
     psThreadJob *job = psListGetAndRemove(done, PS_LIST_HEAD);
-    psThreadUnlock();
     return job;
 }
@@ -198 +198 @@
         // we have to lock here so the job queue cannot be empty yet no threads busy
         psThreadJob *job = NULL;        // Job to process
+        psThreadLock();
         while ((job = psThreadJobGetPending()) == NULL) {
+            // Unlock while sleeping, then lock to read the pending queue again
+            psThreadUnlock();
             usleep(THREAD_WAIT);
+            psThreadLock();
         }
         self->busy = true;
+        psThreadUnlock();
 
         psThreadTask *task = psHashLookup(tasks, job->type); // Task to execute job
@@ -215 +220 @@
         psListAdd(done, PS_LIST_TAIL, job);
         psFree(job);
-        psThreadUnlock();
 
         if (!status) {
@@ -221 +225 @@
         }
         self->busy = false;
+        psThreadUnlock();
     }
 }
@@ -253 +258 @@
 }
 
-// Harvest jobs from the
+// Harvest jobs from the done list
 static void psThreadJobHarvest(void)
 {
@@ -270 +275 @@
         // Ensure everything is harvested, if requested
         if (harvest) {
+            // No threads, no no need to lock
             psThreadJobHarvest();
         }
@@ -284 +290 @@
         }
 
+        psThreadLock();
+
         // Harvest jobs in the background, if requested
         if (harvest) {
@@ -289 +297 @@
         }
 
-#if 0 // Thread state doesn't matter, only the pending job queue
         // are all threads idle?
         for (int i = 0; i < pool->n; i++) {
@@ -298 +305 @@
             }
         }
-#endif
-
-        psThreadLock();
-        bool more = (pending && pending->head) ? true : false; // More to process?
-        psThreadUnlock();
-
-        if (!more) {
-            // Nothing in the queue
+
+        if (!pending || !pending->head) {
+            // Nothing in the queue and nothing more to add
             // Ensure everything is harvested, if requested
             if (harvest) {
                 psThreadJobHarvest();
             }
+            psThreadUnlock();
             return true;
         }
 
+    SLEEP:
+        psThreadUnlock();
         usleep(THREAD_WAIT);
     }