Changeset 1486:da919ff0985c

Timestamp:

08/30/10 15:50:08 (18 months ago)

Author:

niam

Branch:

default

Message:

[pc::execution::workqueue] gently check the closing flag

File:

• sources/src/pcExecutionWorkqueue.cc (modified) (4 diffs)

sources/src/pcExecutionWorkqueue.cc

@@ -113 +113 @@
     dodoList<__work__ *>::iterator o, p;
 
-    threadsProtector->acquire();
+    tasksProtector->acquire();
     closing = true;
-    threadsProtector->release();
-
-    tasksProtector->acquire();
+
     o = tasks.begin();
     p = tasks.end();
@@ -130 +128 @@
     j = inactive.end();
     for (; i != j; ++i) {
-        /* (*i)->stop(); */
+        /* (*i)->wait(); */
         delete *i;
     }
@@ -204 +202 @@
             }
 
-            if (queue->closing)
+            tasksProtector->acquire();
+            if (queue->closing) {
+                tasksProtector->release();
+
                 return 0;
+            }
+            tasksProtector->release();
 
             unsigned long delta = queue->maxThreads - queue->minThreads;
@@ -223 +226 @@
             if (!queue->notification->wait(timeout)) {
                 unsigned long queueSize = tasks.size();
+
+                if (queue->closing) {
+                    tasksProtector->release();
+
+                    return 0;
+                }
                 tasksProtector->release();
-
-                if (queue->closing)
-                    return 0;
 
                 if (queueSize == 0) {