fix headers for case-sensitive FS.

[ardour.git] / libs / pbd / pthread_utils.cc

diff --git a/libs/pbd/pthread_utils.cc b/libs/pbd/pthread_utils.cc
index 91d93ec4f8a73c8b28fdc68ac557bca980b7cc28..b8ca8fc09346274d7dd441ae68d1e0671e7c8534 100644 (file)
--- a/libs/pbd/pthread_utils.cc
+++ b/libs/pbd/pthread_utils.cc
@@ -80,12 +80,34 @@ fake_thread_start (void* arg)
        void* (*thread_work)(void*) = ts->thread_work;
        void* thread_arg = ts->arg;
 
+       /* name will be deleted by the default handler for GStaticPrivate, when the thread exits */
+
        pthread_set_name (ts->name.c_str());
 
+       /* we don't need this object anymore */
+
        delete ts;
-       /* name will be deleted by the default handler for GStaticPrivate, when the thread exits */
 
-       return thread_work (thread_arg);
+       /* actually run the thread's work function */
+
+       void* ret = thread_work (thread_arg);
+
+       /* cleanup */
+
+       pthread_mutex_lock (&thread_map_lock);
+
+       for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
+               if (pthread_equal ((*i), pthread_self())) {
+                       all_threads.erase (i);
+                       break;
+               }
+       }
+
+       pthread_mutex_unlock (&thread_map_lock);
+
+       /* done */
+
+       return ret;
 }
 
 int  
@@ -147,10 +169,17 @@ void
 pthread_cancel_all () 
 {      
        pthread_mutex_lock (&thread_map_lock);
-       for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
+
+       for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ) {
+
+               ThreadMap::iterator nxt = i;
+               ++nxt;
+
                if (!pthread_equal ((*i), pthread_self())) {
                        pthread_cancel ((*i));
                }
+
+               i = nxt;
        }
        all_threads.clear();
        pthread_mutex_unlock (&thread_map_lock);
@@ -171,18 +200,3 @@ pthread_cancel_one (pthread_t thread)
        pthread_mutex_unlock (&thread_map_lock);
 }
 
-void
-pthread_exit_pbd (void* status) 
-{      
-       pthread_t thread = pthread_self();
-
-       pthread_mutex_lock (&thread_map_lock);
-       for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-               if (pthread_equal ((*i), thread)) {
-                       all_threads.erase (i);
-                       break;
-               }
-       }
-       pthread_mutex_unlock (&thread_map_lock);
-       pthread_exit (status);
-}