remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / thread-win32.c

diff --git a/src/pulsecore/thread-win32.c b/src/pulsecore/thread-win32.c
index ee61d85aaeb3170c3665a11e41ad559809e7fdc6..0fa3b917fc3297b66f628c862311e8b018aaa032 100644 (file)
--- a/src/pulsecore/thread-win32.c
+++ b/src/pulsecore/thread-win32.c
@@ -1,18 +1,18 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
- 
+
+  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
@@ -28,7 +28,7 @@
 #include <windows.h>
 
 #include <pulse/xmalloc.h>
-#include <pulsecore/log.h>
+#include <pulsecore/once.h>
 
 #include "thread.h"
 
@@ -50,9 +50,8 @@ struct pa_tls_monitor {
 };
 
 static pa_tls *thread_tls;
-static pa_thread_once_t thread_tls_once = PA_THREAD_ONCE_INIT;
+static pa_once thread_tls_once = PA_ONCE_INIT;
 static pa_tls *monitor_tls;
-static pa_thread_once_t monitor_tls_once = PA_THREAD_ONCE_INIT;
 
 static void thread_tls_once_func(void) {
     thread_tls = pa_tls_new(NULL);
@@ -63,7 +62,7 @@ static DWORD WINAPI internal_thread_func(LPVOID param) {
     pa_thread *t = param;
     assert(t);
 
-    pa_thread_once(&thread_tls_once, thread_tls_once_func);
+    pa_run_once(&thread_tls_once, thread_tls_once_func);
     pa_tls_set(thread_tls, t);
 
     t->thread_func(t->userdata);
@@ -71,8 +70,9 @@ static DWORD WINAPI internal_thread_func(LPVOID param) {
     return 0;
 }
 
-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;
+    DWORD thread_id;
 
     assert(thread_func);
 
@@ -80,7 +80,7 @@ pa_thread* pa_thread_new(pa_thread_func_t thread_func, void *userdata) {
     t->thread_func = thread_func;
     t->userdata = userdata;
 
-    t->thread = CreateThread(NULL, 0, internal_thread_func, t, 0, NULL);
+    t->thread = CreateThread(NULL, 0, internal_thread_func, t, 0, &thread_id);
 
     if (!t->thread) {
         pa_xfree(t);
@@ -109,6 +109,13 @@ void pa_thread_free(pa_thread *t) {
     pa_xfree(t);
 }
 
+void pa_thread_free_nojoin(pa_thread *t) {
+    pa_assert(t);
+
+    CloseHandle(t->thread);
+    pa_xfree(t);
+}
+
 int pa_thread_join(pa_thread *t) {
     assert(t);
 
@@ -119,42 +126,33 @@ int pa_thread_join(pa_thread *t) {
 }
 
 pa_thread* pa_thread_self(void) {
-    pa_thread_once(&thread_tls_once, thread_tls_once_func);
+    pa_run_once(&thread_tls_once, thread_tls_once_func);
     return pa_tls_get(thread_tls);
 }
 
-void pa_thread_yield(void) {
-    Sleep(0);
-}
-
-void pa_thread_once(pa_thread_once_t *control, pa_thread_once_func_t once_func) {
-    HANDLE mutex;
-    char name[64];
+void* pa_thread_get_data(pa_thread *t) {
+    pa_assert(t);
 
-    assert(control);
-    assert(once_func);
-
-    sprintf(name, "pulse%d", (int)GetCurrentProcessId());
+    return t->userdata;
+}
 
-    mutex = CreateMutex(NULL, FALSE, name);
-    assert(mutex);
+void pa_thread_set_data(pa_thread *t, void *userdata) {
+    pa_assert(t);
 
-    WaitForSingleObject(mutex, INFINITE);
+    t->userdata = userdata;
+}
 
-    if (*control == PA_THREAD_ONCE_INIT) {
-        *control = ~PA_THREAD_ONCE_INIT;
-        ReleaseMutex(mutex);
-        once_func();
-    } else
-        ReleaseMutex(mutex);
+void pa_thread_set_name(pa_thread *t, const char *name) {
+    /* Not implemented */
+}
 
-    CloseHandle(mutex);
+const char *pa_thread_get_name(pa_thread *t) {
+    /* Not implemented */
+    return NULL;
 }
 
-static void monitor_tls_once_func(void) {
-    monitor_tls = pa_tls_new(NULL);
-    assert(monitor_tls);
-    pa_tls_set(monitor_tls, NULL);
+void pa_thread_yield(void) {
+    Sleep(0);
 }
 
 static DWORD WINAPI monitor_thread_func(LPVOID param) {
@@ -212,7 +210,11 @@ void *pa_tls_set(pa_tls *t, void *userdata) {
     if (t->free_func) {
         struct pa_tls_monitor *m;
 
-        pa_thread_once(&monitor_tls_once, monitor_tls_once_func);
+        PA_ONCE_BEGIN {
+            monitor_tls = pa_tls_new(NULL);
+            assert(monitor_tls);
+            pa_tls_set(monitor_tls, NULL);
+        } PA_ONCE_END;
 
         m = pa_tls_get(monitor_tls);
         if (!m) {