Changeset 688 for threadman/trunk

Timestamp:

30/06/08 23:35:45 (2 years ago)

Author:

tapted

Message:

Add a cmake optimise option and reduce the risk of a deadlock, holding a lock when waiting

Location:

threadman/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• threadman.cpp (modified) (2 diffs)

threadman/trunk/CMakeLists.txt

@@ -1 +1 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 project(threadman)
+
+OPTION(optimise "Build with optimisations in vanilla make" OFF)
+if (optimise)
+  SET(CMAKE_BUILD_TYPE Release)
+else(optimise)
+  SET(CMAKE_BUILD_TYPE Debug)
+endif(optimise)
 
 ENABLE_TESTING()

threadman/trunk/threadman.cpp

@@ -390 +390 @@
     bail = true; //don't let new stuff get created
     SDL_mutexP(mut);
+    //holding the mutex here is safe -- stop doesn't block
     const SYNCS::iterator e = sync.end();
     for (SYNCS::iterator it = sync.begin(); it != e; ++it)
@@ -402 +403 @@
     stopAll();
     SDL_mutexP(mut);
-    const SYNCS::iterator e = sync.end();
-    for (SYNCS::iterator it = sync.begin(); it != e; ++it) {
+    SYNCS local_sync;
+    RSYNCS local_rsync;
+    std::swap(local_sync, sync);
+    std::swap(local_rsync, rsync);
+    SDL_mutexV(mut);
+
+    const SYNCS::iterator e = local_sync.end();
+    for (SYNCS::iterator it = local_sync.begin(); it != e; ++it) {
         it->second->wait();
         delete it->second;
     }
-    sync.clear();
-    const RSYNCS::iterator re = rsync.end();
-    for (RSYNCS::iterator it = rsync.begin(); it != re; ++it) {
+    const RSYNCS::iterator re = local_rsync.end();
+    for (RSYNCS::iterator it = local_rsync.begin(); it != re; ++it) {
         (*it)->wait();
         delete *it;
     }
-    rsync.clear();
-    SDL_mutexV(mut);
 }