Remove unnecessary #includes

[pulseaudio] / src / pulsecore / mutex-posix.c

diff --git a/src/pulsecore/mutex-posix.c b/src/pulsecore/mutex-posix.c
index 805f11de87081e51d4ff9f5b1ac5dad4d665cdf6..634087d9ecebff2b7ea8b0fe234e25261b713613 100644 (file)
--- a/src/pulsecore/mutex-posix.c
+++ b/src/pulsecore/mutex-posix.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -7,7 +5,7 @@
 
   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
@@ -30,8 +28,6 @@
 
 #include <pulse/xmalloc.h>
 #include <pulsecore/macro.h>
-#include <pulsecore/log.h>
-#include <pulsecore/core-error.h>
 
 #include "mutex.h"
 
@@ -49,7 +45,7 @@ pa_mutex* pa_mutex_new(pa_bool_t recursive, pa_bool_t inherit_priority) {
     int r;
 
     pa_assert_se(pthread_mutexattr_init(&attr) == 0);
-    
+
     if (recursive)
         pa_assert_se(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) == 0);
 
@@ -60,9 +56,9 @@ pa_mutex* pa_mutex_new(pa_bool_t recursive, pa_bool_t inherit_priority) {
 
     m = pa_xnew(pa_mutex, 1);
 
-#ifndef HAVE_PTHREAD_PRIO_INHERIT        
+#ifndef HAVE_PTHREAD_PRIO_INHERIT
     pa_assert_se(pthread_mutex_init(&m->mutex, &attr) == 0);
-    
+
 #else
     if ((r = pthread_mutex_init(&m->mutex, &attr))) {
 
@@ -74,8 +70,8 @@ pa_mutex* pa_mutex_new(pa_bool_t recursive, pa_bool_t inherit_priority) {
         pa_assert_se(pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_NONE) == 0);
         pa_assert_se(pthread_mutex_init(&m->mutex, &attr) == 0);
     }
-#endif        
-    
+#endif
+
     return m;
 }
 
@@ -92,6 +88,18 @@ void pa_mutex_lock(pa_mutex *m) {
     pa_assert_se(pthread_mutex_lock(&m->mutex) == 0);
 }
 
+pa_bool_t pa_mutex_try_lock(pa_mutex *m) {
+    int r;
+    pa_assert(m);
+
+    if ((r = pthread_mutex_trylock(&m->mutex)) != 0) {
+        pa_assert(r == EBUSY);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 void pa_mutex_unlock(pa_mutex *m) {
     pa_assert(m);
 
@@ -128,3 +136,25 @@ int pa_cond_wait(pa_cond *c, pa_mutex *m) {
 
     return pthread_cond_wait(&c->cond, &m->mutex);
 }
+
+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;
+}