Changeset 1476:fdb1826f79da

Timestamp:

08/28/10 14:26:05 (18 months ago)

Author:

niam

Branch:

default

Message:

[pc::execution::thread] fix memory leak in case of detached/canceled thread

Location:

sources

Files:

• examples/pc_thread/test.cc (modified) (2 diffs)
• src/pcExecutionThread.cc (modified) (4 diffs)

sources/examples/pc_thread/test.cc

@@ -34 +34 @@
     }
 
-    // throwing *eception
+    // throwing exception
     tools::os::os::setWorkingDir("./dir/");
 
@@ -48 +48 @@
 
         ::data.set((void *)data);
+
+        execution::thread(thread, (void *)"detached", execution::ON_DESTRUCTION_KEEP_ALIVE, true).run();
 
         execution::manager manager;

sources/src/pcExecutionThread.cc

@@ -130 +130 @@
     }
 
+    if (ti->detached) {
+#ifdef DL_EXT
+        if (ti->handle != NULL) {
+            thread::deinitModule deinit = (thread::deinitModule)dlsym(ti->handle, "deinitPcExecutionThreadModule");
+            if (deinit != NULL)
+                deinit(ti->cookie);
+
+#ifndef DL_FAST
+            dlclose(ti->handle);
+#endif
+        }
+#endif
+
+        delete ti->ex;
+        delete ti;
+    }
+
     return NULL;
 }
@@ -155 +172 @@
     handle->func = (void *)func;
     handle->action = action;
-#ifdef DL_EXT
-    handle->handle = NULL;
-#endif
 
 #ifdef PTHREAD_EXT
@@ -244 +258 @@
 {
     if (!cloned) {
-#ifdef DL_EXT
-        deinitModule deinit;
-#endif
-
 #ifdef PTHREAD_EXT
         pthread_attr_destroy(&handle->attr);
 #endif
 
-        if (!isRunning() || handle->detached)
-            return;
-
-        switch (handle->action) {
-            case ON_DESTRUCTION_KEEP_ALIVE:
-
-#ifdef PTHREAD_EXT
-                pthread_detach(handle->thread);
-#endif
-
-                break;
-
-            case ON_DESTRUCTION_STOP:
-
-#ifdef PTHREAD_EXT
-                pthread_cancel(handle->thread);
-#endif
-
-                break;
-
-            case ON_DESTRUCTION_WAIT:
-            default:
-
-#ifdef PTHREAD_EXT
-                pthread_join(handle->thread, NULL);
-#endif
-
-                break;
+        if (isRunning()) {
+            if (handle->detached)
+                return;
+
+            switch (handle->action) {
+                case ON_DESTRUCTION_KEEP_ALIVE:
+                    handle->detached = true;
+#ifdef PTHREAD_EXT
+                    pthread_detach(handle->thread);
+#endif
+                    return;
+
+                case ON_DESTRUCTION_STOP:
+#ifdef PTHREAD_EXT
+                    pthread_cancel(handle->thread);
+#endif
+                    break;
+            }
         }
 
+#ifdef PTHREAD_EXT
+        if (!handle->joined)
+            pthread_join(handle->thread, NULL);
+#endif
+
 #ifdef DL_EXT
         if (handle->handle != NULL) {
-            deinit = (deinitModule)dlsym(handle->handle, "deinitPcExecutionThreadModule");
+            deinitModule deinit = (deinitModule)dlsym(handle->handle, "deinitPcExecutionThreadModule");
             if (deinit != NULL)
                 deinit(handle->cookie);
@@ -293 +298 @@
         }
 #endif
-    }
-
-    delete handle->ex;
-
-    delete handle;
+
+        delete handle->ex;
+        delete handle;
+    }
 }