mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 'lennart' branch back into trunk.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/pulsecore/thread-win32.c
View file

@ -53,9 +53,8 @@ struct pa_tls_monitor {
};
static pa_tls *thread_tls;
static pa_once_t thread_tls_once = PA_ONCE_INIT;
static pa_once thread_tls_once = PA_ONCE_INIT;
static pa_tls *monitor_tls;
static pa_once_t monitor_tls_once = PA_ONCE_INIT;
static void thread_tls_once_func(void) {
thread_tls = pa_tls_new(NULL);
@ -66,7 +65,7 @@ static DWORD WINAPI internal_thread_func(LPVOID param) {
pa_thread *t = param;
assert(t);
pa_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);
@ -122,7 +121,7 @@ int pa_thread_join(pa_thread *t) {
}
pa_thread* pa_thread_self(void) {
pa_once(&thread_tls_once, thread_tls_once_func);
pa_run_once(&thread_tls_once, thread_tls_once_func);
return pa_tls_get(thread_tls);
}
@ -130,12 +129,6 @@ void pa_thread_yield(void) {
Sleep(0);
}
static void monitor_tls_once_func(void) {
monitor_tls = pa_tls_new(NULL);
assert(monitor_tls);
pa_tls_set(monitor_tls, NULL);
}
static DWORD WINAPI monitor_thread_func(LPVOID param) {
struct pa_tls_monitor *m = param;
assert(m);
@ -191,7 +184,11 @@ void *pa_tls_set(pa_tls *t, void *userdata) {
if (t->free_func) {
struct pa_tls_monitor *m;
pa_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) {