$Id$
*/
-#include <map>
+#include <set>
#include <iostream>
#include <string>
+#include <cstring>
#include <stdint.h>
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
+#ifdef WINE_THREAD_SUPPORT
+#include <fst.h>
+#endif
using namespace std;
-typedef std::map<string,pthread_t> ThreadMap;
+typedef std::set<pthread_t> ThreadMap;
static ThreadMap all_threads;
static pthread_mutex_t thread_map_lock = PTHREAD_MUTEX_INITIALIZER;
+static Glib::StaticPrivate<char> thread_name;
namespace PBD {
- sigc::signal<void,pthread_t,std::string> ThreadCreated;
- sigc::signal<void,pthread_t,std::string,uint32_t> ThreadCreatedWithRequestSize;
+ PBD::Signal4<void,std::string, pthread_t,std::string,uint32_t> ThreadCreatedWithRequestSize;
}
using namespace PBD;
+static int thread_creator (pthread_t* thread_id, const pthread_attr_t* attr, void *(*function)(void*), void* arg)
+{
+#ifdef WINE_THREAD_SUPPORT
+ return wine_pthread_create (thread_id, attr, function, arg);
+#else
+ return pthread_create (thread_id, attr, function, arg);
+#endif
+}
+
+void
+PBD::notify_gui_about_thread_creation (std::string target_gui, pthread_t thread, std::string str, int request_count)
+{
+ ThreadCreatedWithRequestSize (target_gui, thread, str, request_count);
+}
+
+struct ThreadStartWithName {
+ void* (*thread_work)(void*);
+ void* arg;
+ std::string name;
+
+ ThreadStartWithName (void* (*f)(void*), void* a, const std::string& s)
+ : thread_work (f), arg (a), name (s) {}
+};
+
+static void*
+fake_thread_start (void* arg)
+{
+ ThreadStartWithName* ts = (ThreadStartWithName*) arg;
+ void* (*thread_work)(void*) = ts->thread_work;
+ void* thread_arg = ts->arg;
+
+ pthread_set_name (ts->name.c_str());
+
+ delete ts;
+ /* name will be deleted by the default handler for GStaticPrivate, when the thread exits */
+
+ return thread_work (thread_arg);
+}
+
int
-pthread_create_and_store (string name, pthread_t *thread, pthread_attr_t *attr, void * (*start_routine)(void *), void * arg)
+pthread_create_and_store (string name, pthread_t *thread, void * (*start_routine)(void *), void * arg)
{
+ pthread_attr_t default_attr;
int ret;
- if ((ret = pthread_create (thread, attr, start_routine, arg)) == 0) {
- std::pair<string,pthread_t> newpair;
- newpair.first = name;
- newpair.second = *thread;
+ // set default stack size to sensible default for memlocking
+ pthread_attr_init(&default_attr);
+ pthread_attr_setstacksize(&default_attr, 500000);
- pthread_mutex_lock (&thread_map_lock);
- all_threads.insert (newpair);
+ ThreadStartWithName* ts = new ThreadStartWithName (start_routine, arg, name);
+ if ((ret = thread_creator (thread, &default_attr, fake_thread_start, ts)) == 0) {
+ pthread_mutex_lock (&thread_map_lock);
+ all_threads.insert (*thread);
pthread_mutex_unlock (&thread_map_lock);
}
-
+
+ pthread_attr_destroy(&default_attr);
+
return ret;
}
-string
+void
+pthread_set_name (const char *str)
+{
+ /* copy string and delete it when exiting */
+
+ thread_name.set (strdup (str), free);
+}
+
+const char *
pthread_name ()
{
- pthread_t self = pthread_self();
- string str;
+ const char* str = thread_name.get ();
- pthread_mutex_lock (&thread_map_lock);
- for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
- if (i->second == self) {
- str = i->first;
- pthread_mutex_unlock (&thread_map_lock);
- return str;
- }
- }
- pthread_mutex_unlock (&thread_map_lock);
+ if (str) {
+ return str;
+ }
return "unknown";
}
{
pthread_mutex_lock (&thread_map_lock);
for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
- if (i->second != pthread_self()) {
- pthread_kill (i->second, signum);
+ if ((*i) != pthread_self()) {
+ pthread_kill ((*i), signum);
}
}
all_threads.clear();
{
pthread_mutex_lock (&thread_map_lock);
for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
- if (i->second != pthread_self()) {
- pthread_cancel (i->second);
+ if ((*i) != pthread_self()) {
+ pthread_cancel ((*i));
}
}
all_threads.clear();
{
pthread_mutex_lock (&thread_map_lock);
for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
- if (i->second == thread) {
+ if ((*i) == thread) {
all_threads.erase (i);
break;
}
pthread_mutex_lock (&thread_map_lock);
for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
- if (i->second == thread) {
+ if ((*i) == thread) {
all_threads.erase (i);
break;
}