dbus: first restart timer, then dispatch it

[pulseaudio] / src / pulsecore / memtrap.c

diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index e06f60ca8fa6cfb71c9abc82dde3ed9e8c250384..4fc1821050482eeff2ea73c435d69470717a2649 100644 (file)
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -37,6 +37,7 @@
 #include <pulsecore/aupdate.h>
 #include <pulsecore/atomic.h>
 #include <pulsecore/once.h>
+#include <pulsecore/mutex.h>
 
 #include "memtrap.h"
 
@@ -49,6 +50,7 @@ struct pa_memtrap {
 
 static pa_memtrap *memtraps[2] = { NULL, NULL };
 static pa_aupdate *aupdate;
+static pa_static_mutex mutex = PA_STATIC_MUTEX_INIT; /* only required to serialize access to the write side */
 
 static void allocate_aupdate(void) {
     PA_ONCE_BEGIN {
@@ -63,7 +65,7 @@ pa_bool_t pa_memtrap_is_good(pa_memtrap *m) {
 }
 
 static void sigsafe_error(const char *s) {
-    write(STDERR_FILENO, s, strlen(s));
+    (void) write(STDERR_FILENO, s, strlen(s));
 }
 
 static void signal_handler(int sig, siginfo_t* si, void *data) {
@@ -105,7 +107,10 @@ static void memtrap_link(pa_memtrap *m, unsigned j) {
     pa_assert(m);
 
     m->prev[j] = NULL;
-    m->next[j] = memtraps[j];
+
+    if ((m->next[j] = memtraps[j]))
+        m->next[j]->prev[j] = m;
+
     memtraps[j] = m;
 }
 
@@ -124,6 +129,7 @@ static void memtrap_unlink(pa_memtrap *m, unsigned j) {
 pa_memtrap* pa_memtrap_add(const void *start, size_t size) {
     pa_memtrap *m = NULL;
     unsigned j;
+    pa_mutex *mx;
 
     pa_assert(start);
     pa_assert(size > 0);
@@ -138,33 +144,45 @@ pa_memtrap* pa_memtrap_add(const void *start, size_t size) {
 
     allocate_aupdate();
 
+    mx = pa_static_mutex_get(&mutex, FALSE, TRUE);
+    pa_mutex_lock(mx);
+
     j = pa_aupdate_write_begin(aupdate);
     memtrap_link(m, j);
     j = pa_aupdate_write_swap(aupdate);
     memtrap_link(m, j);
     pa_aupdate_write_end(aupdate);
 
+    pa_mutex_unlock(mx);
+
     return m;
 }
 
 void pa_memtrap_remove(pa_memtrap *m) {
     unsigned j;
+    pa_mutex *mx;
 
     pa_assert(m);
 
     allocate_aupdate();
 
+    mx = pa_static_mutex_get(&mutex, FALSE, TRUE);
+    pa_mutex_lock(mx);
+
     j = pa_aupdate_write_begin(aupdate);
     memtrap_unlink(m, j);
     j = pa_aupdate_write_swap(aupdate);
     memtrap_unlink(m, j);
     pa_aupdate_write_end(aupdate);
 
+    pa_mutex_unlock(mx);
+
     pa_xfree(m);
 }
 
 pa_memtrap *pa_memtrap_update(pa_memtrap *m, const void *start, size_t size) {
     unsigned j;
+    pa_mutex *mx;
 
     pa_assert(m);
 
@@ -176,24 +194,29 @@ pa_memtrap *pa_memtrap_update(pa_memtrap *m, const void *start, size_t size) {
 
     allocate_aupdate();
 
+    mx = pa_static_mutex_get(&mutex, FALSE, TRUE);
+    pa_mutex_lock(mx);
+
     j = pa_aupdate_write_begin(aupdate);
 
     if (m->start == start && m->size == size)
         goto unlock;
 
     memtrap_unlink(m, j);
-    j = pa_aupdate_write_swap(aupdate);
+    pa_aupdate_write_swap(aupdate);
 
     m->start = (void*) start;
     m->size = size;
     pa_atomic_store(&m->bad, 0);
 
-    j = pa_aupdate_write_swap(aupdate);
+    pa_assert_se(pa_aupdate_write_swap(aupdate) == j);
     memtrap_link(m, j);
 
 unlock:
     pa_aupdate_write_end(aupdate);
 
+    pa_mutex_unlock(mx);
+
     return m;
 }