summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Bosmans <mkbosmans@gmail.com>2011-01-04 17:07:50 +0100
committerMaarten Bosmans <mkbosmans@gmail.com>2011-02-17 11:58:22 +0100
commit0ac0479534d9cb6e4ef734eeb3a663f33a4f8ef3 (patch)
tree7326f1efbef7ecf59b717625097a47ad1c1385d4
parent4f1d4044f8409ff29eeb7f97324daba496e40714 (diff)
Adapt win32 specific code to current API
-rw-r--r--src/daemon/main.c4
-rw-r--r--src/pulsecore/mutex-win32.c25
-rw-r--r--src/pulsecore/thread-win32.c5
3 files changed, 29 insertions, 5 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c
index de809b1b..cab275f3 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -133,7 +133,7 @@ static void message_cb(pa_mainloop_api*a, pa_time_event*e, const struct timeval
}
pa_timeval_add(pa_gettimeofday(&tvnext), 100000);
- a->rtclock_time_restart(e, &tvnext);
+ a->time_restart(e, &tvnext);
}
#endif
@@ -980,7 +980,7 @@ int main(int argc, char *argv[]) {
#endif
#ifdef OS_IS_WIN32
- win32_timer = pa_mainloop_get_api(mainloop)->rtclock_time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL);
+ win32_timer = pa_mainloop_get_api(mainloop)->time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL);
#endif
if (!conf->no_cpu_limit)
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;
+}
diff --git a/src/pulsecore/thread-win32.c b/src/pulsecore/thread-win32.c
index 0a1baa54..7d458b97 100644
--- a/src/pulsecore/thread-win32.c
+++ b/src/pulsecore/thread-win32.c
@@ -71,8 +71,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 +81,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);