From 0ac0479534d9cb6e4ef734eeb3a663f33a4f8ef3 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 4 Jan 2011 17:07:50 +0100 Subject: Adapt win32 specific code to current API --- src/pulsecore/mutex-win32.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/pulsecore/mutex-win32.c') diff --git a/src/pulsecore/mutex-win32.c b/src/pulsecore/mutex-win32.c index 3a910b03..f4652a90 100644 --- a/src/pulsecore/mutex-win32.c +++ b/src/pulsecore/mutex-win32.c @@ -91,7 +91,7 @@ void pa_cond_signal(pa_cond *c, int broadcast) { return; if (broadcast) - SetEvent(pa_hashmap_get_first(c->wait_events)); + SetEvent(pa_hashmap_first(c->wait_events)); else { void *iter; const void *key; @@ -131,3 +131,26 @@ int pa_cond_wait(pa_cond *c, pa_mutex *m) { return 0; } + +/* This is a copy of the function in mutex-posix.c */ +pa_mutex* pa_static_mutex_get(pa_static_mutex *s, pa_bool_t recursive, pa_bool_t inherit_priority) { + pa_mutex *m; + + pa_assert(s); + + /* First, check if already initialized and short cut */ + if ((m = pa_atomic_ptr_load(&s->ptr))) + return m; + + /* OK, not initialized, so let's allocate, and fill in */ + m = pa_mutex_new(recursive, inherit_priority); + if ((pa_atomic_ptr_cmpxchg(&s->ptr, NULL, m))) + return m; + + pa_mutex_free(m); + + /* Him, filling in failed, so someone else must have filled in + * already */ + pa_assert_se(m = pa_atomic_ptr_load(&s->ptr)); + return m; +} -- cgit