Changeset 1484:751cc39c852f

Timestamp:

08/29/10 12:44:24 (18 months ago)

Author:

niam

Branch:

default

Message:

[pc::execution::workqueue] properly handle exceptions in constructor

File:

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

sources/src/pcExecutionWorkqueue.cc

@@ -41 +41 @@
 #include <libdodo/pcSyncThread.h>
 #include <libdodo/pcNotificationThread.h>
+#include <libdodo/exceptionBasic.h>
 #include <libdodo/pcSyncStack.h>
 #include <libdodo/types.h>
@@ -77 +78 @@
                                      minThreads(minThreads),
                                      minIdleTime(minIdleTime),
-                                     tasksProtector(new pc::sync::thread),
-                                     threadsProtector(new pc::sync::thread),
-                                     notification(new pc::notification::thread(*tasksProtector)),
+                                     tasksProtector(NULL),
+                                     threadsProtector(NULL),
+                                     notification(NULL),
                                      closing(false)
 {
-    if (maxThreads < minThreads)
-        maxThreads = minThreads;
-
-    thread *t;
-    for (unsigned int i=0; i<minThreads; ++i) {
-        t = new thread((routine)workqueue::worker, this, ON_DESTRUCTION_STOP);
-        inactive.push_back(t);
-        t->run();
+    dodo_try {
+        tasksProtector = new pc::sync::thread;
+        threadsProtector = new pc::sync::thread;
+        notification = new pc::notification::thread(*tasksProtector);
+
+        if (maxThreads < minThreads)
+            maxThreads = minThreads;
+
+        thread *t;
+        for (unsigned int i=0; i<minThreads; ++i) {
+            t = new thread((routine)workqueue::worker, this, ON_DESTRUCTION_STOP);
+            inactive.push_back(t);
+            t->run();
+        }
+    } dodo_catch (exception::basic *e UNUSED) {
+        delete notification;
+        delete tasksProtector;
+        delete threadsProtector;
+
+        dodo_rethrow;
     }
 }