avoid a set of calls to gettext() and/or cousins from global constructor scope

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

diff --git a/libs/pbd/pthread_utils.cc b/libs/pbd/pthread_utils.cc
index d9e5ca40785f6c2aba4e76ad5876b68da8121338..b8ca8fc09346274d7dd441ae68d1e0671e7c8534 100644 (file)
--- a/libs/pbd/pthread_utils.cc
+++ b/libs/pbd/pthread_utils.cc
@@ -19,7 +19,6 @@
 */
 
 #include <set>
-#include <iostream>
 #include <string>
 #include <cstring>
 #include <stdint.h>
@@ -29,12 +28,20 @@
 #include <fst.h>
 #endif
 
+#ifdef COMPILER_MSVC
+DECLARE_DEFAULT_COMPARISONS(pthread_t)  // Needed for 'DECLARE_DEFAULT_COMPARISONS'. Objects in an STL container can be
+                                        // searched and sorted. Thus, when instantiating the container, MSVC complains
+                                        // if the type of object being contained has no appropriate comparison operators
+                                        // defined (specifically, if operators '<' and '==' are undefined). This seems
+                                        // to be the case with ptw32 'pthread_t' which is a simple struct.
+#endif
+
 using namespace std;
 
-typedef std::set<pthread_t> ThreadMap;
+typedef std::list<pthread_t> ThreadMap;
 static ThreadMap all_threads;
 static pthread_mutex_t thread_map_lock = PTHREAD_MUTEX_INITIALIZER;
-static Glib::StaticPrivate<char> thread_name;
+static Glib::Threads::Private<char> thread_name (free);
 
 namespace PBD {
        PBD::Signal4<void,std::string, pthread_t,std::string,uint32_t> ThreadCreatedWithRequestSize;
@@ -73,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  
@@ -95,7 +124,7 @@ pthread_create_and_store (string name, pthread_t  *thread, void * (*start_routin
 
        if ((ret = thread_creator (thread, &default_attr, fake_thread_start, ts)) == 0) {
                pthread_mutex_lock (&thread_map_lock);
-               all_threads.insert (*thread);
+               all_threads.push_back (*thread);
                pthread_mutex_unlock (&thread_map_lock);
        }
 
@@ -109,7 +138,7 @@ pthread_set_name (const char *str)
 {
        /* copy string and delete it when exiting */
        
-       thread_name.set (strdup (str), free);
+       thread_name.set (strdup (str));
 }
 
 const char *
@@ -128,7 +157,7 @@ pthread_kill_all (int signum)
 {      
        pthread_mutex_lock (&thread_map_lock);
        for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-               if ((*i) != pthread_self()) {
+               if (!pthread_equal ((*i), pthread_self())) {
                        pthread_kill ((*i), signum);
                }
        }
@@ -140,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) {
-               if ((*i) != pthread_self()) {
+
+       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);
@@ -154,7 +190,7 @@ pthread_cancel_one (pthread_t thread)
 {      
        pthread_mutex_lock (&thread_map_lock);
        for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-               if ((*i) == thread) {
+               if (pthread_equal ((*i), thread)) {
                        all_threads.erase (i);
                        break;
                }
@@ -164,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 ((*i) == thread) {
-                       all_threads.erase (i);
-                       break;
-               }
-       }
-       pthread_mutex_unlock (&thread_map_lock);
-       pthread_exit (status);
-}