]> code.delx.au - pulseaudio/blobdiff - src/pulsecore/thread-posix.c
remap: Change remapping function argument type from void to int16_t / float as approp...
[pulseaudio] / src / pulsecore / thread-posix.c
index 2e8d6b68ac96140e5a2fa26026fc3c16dc0d733b..5c19b43f50400c32ca8522e9857423e23e4d3793 100644 (file)
@@ -1,18 +1,19 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
+
+  Copyright 2006 Lennart Poettering
+  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,
   or (at your option) any later version.
+
   PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
+
   You should have received a copy of the GNU Lesser General Public License
   along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #include <config.h>
 #endif
 
-#include <assert.h>
 #include <pthread.h>
 #include <sched.h>
+#include <errno.h>
 
-#include <atomic_ops.h>
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
 
 #include <pulse/xmalloc.h>
-#include <pulsecore/mutex.h>
+#include <pulsecore/atomic.h>
+#include <pulsecore/macro.h>
 
 #include "thread.h"
 
-#define ASSERT_SUCCESS(x) do { \
-    int _r = (x); \
-    assert(_r == 0); \
-} while(0)
-
 struct pa_thread {
     pthread_t id;
     pa_thread_func_t thread_func;
     void *userdata;
-    AO_t running;
+    pa_atomic_t running;
+    bool joined;
+    char *name;
 };
 
 struct pa_tls {
     pthread_key_t key;
 };
 
-static pa_tls *thread_tls;
-static pthread_once_t thread_tls_once = PTHREAD_ONCE_INIT;
+static void thread_free_cb(void *p) {
+    pa_thread *t = p;
 
-static pa_mutex *once_mutex;
-static pthread_once_t thread_once_once = PTHREAD_ONCE_INIT;
+    pa_assert(t);
 
-static void thread_tls_once_func(void) {
-    thread_tls = pa_tls_new(NULL);
-    assert(thread_tls);
+    if (!t->thread_func) {
+        /* This is a foreign thread, we need to free the struct */
+        pa_xfree(t->name);
+        pa_xfree(t);
+    }
 }
 
+PA_STATIC_TLS_DECLARE(current_thread, thread_free_cb);
+
 static void* internal_thread_func(void *userdata) {
     pa_thread *t = userdata;
-    assert(t);
+    pa_assert(t);
+
+#ifdef __linux__
+    prctl(PR_SET_NAME, t->name);
+#elif defined(HAVE_PTHREAD_SETNAME_NP) && defined(OS_IS_DARWIN)
+    pthread_setname_np(t->name);
+#endif
 
     t->id = pthread_self();
 
-    ASSERT_SUCCESS(pthread_once(&thread_tls_once, thread_tls_once_func));
-    pa_tls_set(thread_tls, t);
-    
-    AO_fetch_and_add1_full(&t->running);
+    PA_STATIC_TLS_SET(current_thread, t);
+
+    pa_atomic_inc(&t->running);
     t->thread_func(t->userdata);
-    AO_fetch_and_add_full(&t->running, (AO_t) -2);
-    
+    pa_atomic_sub(&t->running, 2);
+
     return NULL;
 }
 
-pa_thread* pa_thread_new(pa_thread_func_t thread_func, void *userdata) {
+pa_thread* pa_thread_new(const char *name, pa_thread_func_t thread_func, void *userdata) {
     pa_thread *t;
 
-    t = pa_xnew(pa_thread, 1);
+    pa_assert(thread_func);
+
+    t = pa_xnew0(pa_thread, 1);
+    t->name = pa_xstrdup(name);
     t->thread_func = thread_func;
     t->userdata = userdata;
-    AO_store_full(&t->running, 0);
 
     if (pthread_create(&t->id, NULL, internal_thread_func, t) < 0) {
         pa_xfree(t);
         return NULL;
     }
 
-    AO_fetch_and_add1_full(&t->running);
+    pa_atomic_inc(&t->running);
 
     return t;
 }
 
 int pa_thread_is_running(pa_thread *t) {
-    AO_t r;
-    assert(t);
+    pa_assert(t);
 
-    r = AO_load_full(&t->running);
-    return r == 1 || r == 2;
+    /* Unfortunately there is no way to tell whether a "foreign"
+     * thread is still running. See
+     * http://udrepper.livejournal.com/16844.html for more
+     * information */
+    pa_assert(t->thread_func);
+
+    return pa_atomic_load(&t->running) > 0;
 }
 
 void pa_thread_free(pa_thread *t) {
-    assert(t);
-    
+    pa_assert(t);
+
     pa_thread_join(t);
+
+    pa_xfree(t->name);
+    pa_xfree(t);
+}
+
+void pa_thread_free_nojoin(pa_thread *t) {
+    pa_assert(t);
+
+    pa_xfree(t->name);
     pa_xfree(t);
 }
 
 int pa_thread_join(pa_thread *t) {
-    assert(t);
-    
+    pa_assert(t);
+    pa_assert(t->thread_func);
+
+    if (t->joined)
+        return -1;
+
+    t->joined = true;
     return pthread_join(t->id, NULL);
 }
 
 pa_thread* pa_thread_self(void) {
-    ASSERT_SUCCESS(pthread_once(&thread_tls_once, thread_tls_once_func));
-    return pa_tls_get(thread_tls);
+    pa_thread *t;
+
+    if ((t = PA_STATIC_TLS_GET(current_thread)))
+        return t;
+
+    /* This is a foreign thread, let's create a pthread structure to
+     * make sure that we can always return a sensible pointer */
+
+    t = pa_xnew0(pa_thread, 1);
+    t->id = pthread_self();
+    t->joined = true;
+    pa_atomic_store(&t->running, 2);
+
+    PA_STATIC_TLS_SET(current_thread, t);
+
+    return t;
 }
 
-void pa_thread_yield(void) {
-#ifdef HAVE_PTHREAD_YIELD
-    pthread_yield();
-#else
-    sched_yield();
-#endif
+void* pa_thread_get_data(pa_thread *t) {
+    pa_assert(t);
+
+    return t->userdata;
 }
 
-static void thread_once_once_func(void) {
-    once_mutex = pa_mutex_new(0);
-    assert(once_mutex);
+void pa_thread_set_data(pa_thread *t, void *userdata) {
+    pa_assert(t);
+
+    t->userdata = userdata;
 }
 
-void pa_thread_once(pa_thread_once_t *control, pa_thread_once_func_t once_func) {
-    assert(control);
-    assert(once_func);
+void pa_thread_set_name(pa_thread *t, const char *name) {
+    pa_assert(t);
 
-    ASSERT_SUCCESS(pthread_once(&thread_once_once, thread_once_once_func));
+    pa_xfree(t->name);
+    t->name = pa_xstrdup(name);
 
-    pa_mutex_lock(once_mutex);
+#ifdef __linux__
+    prctl(PR_SET_NAME, name);
+#elif defined(HAVE_PTHREAD_SETNAME_NP) && defined(OS_IS_DARWIN)
+    pthread_setname_np(name);
+#endif
+}
 
-    if (*control == PA_THREAD_ONCE_INIT) {
-        *control = ~PA_THREAD_ONCE_INIT;
-        pa_mutex_unlock(once_mutex);
-        once_func();
-    } else
-        pa_mutex_unlock(once_mutex);
+const char *pa_thread_get_name(pa_thread *t) {
+    pa_assert(t);
+
+#ifdef __linux__
+    if (!t->name) {
+        t->name = pa_xmalloc(17);
+
+        if (prctl(PR_GET_NAME, t->name) >= 0)
+            t->name[16] = 0;
+        else {
+            pa_xfree(t->name);
+            t->name = NULL;
+        }
+    }
+#elif defined(HAVE_PTHREAD_GETNAME_NP) && defined(OS_IS_DARWIN)
+    if (!t->name) {
+        t->name = pa_xmalloc0(17);
+        pthread_getname_np(t->id, t->name, 16);
+    }
+#endif
+
+    return t->name;
+}
+
+void pa_thread_yield(void) {
+#ifdef HAVE_PTHREAD_YIELD
+    pthread_yield();
+#else
+    pa_assert_se(sched_yield() == 0);
+#endif
 }
 
 pa_tls* pa_tls_new(pa_free_cb_t free_cb) {
@@ -159,28 +230,27 @@ pa_tls* pa_tls_new(pa_free_cb_t free_cb) {
         pa_xfree(t);
         return NULL;
     }
-        
+
     return t;
 }
 
 void pa_tls_free(pa_tls *t) {
-    assert(t);
+    pa_assert(t);
 
-    ASSERT_SUCCESS(pthread_key_delete(t->key));
+    pa_assert_se(pthread_key_delete(t->key) == 0);
     pa_xfree(t);
 }
 
 void *pa_tls_get(pa_tls *t) {
-    assert(t);
-    
+    pa_assert(t);
+
     return pthread_getspecific(t->key);
 }
 
 void *pa_tls_set(pa_tls *t, void *userdata) {
     void *r;
-    
+
     r = pthread_getspecific(t->key);
-    ASSERT_SUCCESS(pthread_setspecific(t->key, userdata));
+    pa_assert_se(pthread_setspecific(t->key, userdata) == 0);
     return r;
 }
-