Fix up build structure for platform dependent modules. Also add implementation

on Win32 for pa_once().


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1395 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-09-11 07:56:03 +00:00
parent a85b3e2dd4
commit 772645922a
3 changed files with 96 additions and 56 deletions

View file

@ -29,6 +29,7 @@
#include <pulse/xmalloc.h>
#include <pulsecore/log.h>
#include <pulsecore/once.h>
#include "thread.h"
@ -50,9 +51,9 @@ struct pa_tls_monitor {
};
static pa_tls *thread_tls;
static pa_thread_once_t thread_tls_once = PA_THREAD_ONCE_INIT;
static pa_once_t thread_tls_once = PA_ONCE_INIT;
static pa_tls *monitor_tls;
static pa_thread_once_t monitor_tls_once = PA_THREAD_ONCE_INIT;
static pa_once_t monitor_tls_once = PA_ONCE_INIT;
static void thread_tls_once_func(void) {
thread_tls = pa_tls_new(NULL);
@ -63,7 +64,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_once(&thread_tls_once, thread_tls_once_func);
pa_tls_set(thread_tls, t);
t->thread_func(t->userdata);
@ -119,7 +120,7 @@ int pa_thread_join(pa_thread *t) {
}
pa_thread* pa_thread_self(void) {
pa_thread_once(&thread_tls_once, thread_tls_once_func);
pa_once(&thread_tls_once, thread_tls_once_func);
return pa_tls_get(thread_tls);
}
@ -127,30 +128,6 @@ 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];
assert(control);
assert(once_func);
sprintf(name, "pulse%d", (int)GetCurrentProcessId());
mutex = CreateMutex(NULL, FALSE, name);
assert(mutex);
WaitForSingleObject(mutex, INFINITE);
if (*control == PA_THREAD_ONCE_INIT) {
*control = ~PA_THREAD_ONCE_INIT;
ReleaseMutex(mutex);
once_func();
} else
ReleaseMutex(mutex);
CloseHandle(mutex);
}
static void monitor_tls_once_func(void) {
monitor_tls = pa_tls_new(NULL);
assert(monitor_tls);
@ -212,7 +189,7 @@ 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(&monitor_tls_once, monitor_tls_once_func);
m = pa_tls_get(monitor_tls);
if (!m) {