Changeset 20834

Timestamp:

Nov 25, 2008, 3:22:30 PM (17 years ago)

Author:

Paul Price

Message:

Ensure all jobs are harvested before returning.

File:

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

trunk/psLib/src/sys/psThread.c

@@ -254 +254 @@
 }
 
+// Harvest jobs from the
+static void psThreadJobHarvest(void)
+{
+    psThreadLock();
+    psThreadJob *job;           // Job from done queue
+    while ((job = psThreadJobGetDone())) {
+        psFree(job);
+    }
+    psThreadUnlock();
+    return;
+}
+
 // call this function after you have added jobs to the queue and
 bool psThreadPoolWait(bool harvest)
@@ -273 +285 @@
         // Harvest jobs, if requested
         if (harvest) {
-            psThreadLock();
-            psThreadJob *job;           // Job from done queue
-            while ((job = psThreadJobGetDone())) {
-                psFree(job);
-            }
-            psThreadUnlock();
+            psThreadJobHarvest();
         }
 
@@ -294 +301 @@
             // Nothing in the queue
             psThreadUnlock();
+            // Ensure everything is harvested, if requested
+            if (harvest) {
+                psThreadJobHarvest();
+            }
             return true;
         }