Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / event.c

diff --git a/src/event.c b/src/event.c
index 5e9763e2702835672c760d93115787308726dab6..8ceab36240224ab8192a80071469ff8160f0cba0 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -199,7 +199,7 @@ static void signalio_handler(event_loop_t *loop, void *data, int flags) {
        });
 
        if(sig) {
-               sig->set = false;
+               atomic_flag_clear(&sig->set);
                sig->cb(loop, sig->data);
        }
 }
@@ -224,12 +224,11 @@ static void pipe_exit(event_loop_t *loop) {
 }
 
 void signal_trigger(event_loop_t *loop, signal_t *sig) {
-       if(sig->set) {
+       if(atomic_flag_test_and_set(&sig->set)) {
                return;
        }
 
        uint8_t signum = sig->signum;
-       sig->set = true;
        write(loop->pipefd[1], &signum, 1);
        return;
 }
@@ -240,9 +239,10 @@ void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, u
        sig->cb = cb;
        sig->data = data;
        sig->signum = signum;
-       sig->set = false;
        sig->node.data = sig;
 
+       atomic_flag_clear(&sig->set);
+
        if(loop->pipefd[0] == -1) {
                pipe_init(loop);
        }
@@ -311,7 +311,7 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
                }
 
                // release mesh mutex during select
-               assert(pthread_mutex_unlock(mutex) == 0);
+               pthread_mutex_unlock(mutex);
 
 #ifdef HAVE_PSELECT
                int n = pselect(fds, &readable, &writable, NULL, &ts, NULL);
@@ -320,7 +320,9 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
                int n = select(fds, &readable, &writable, NULL, (struct timeval *)&tv);
 #endif
 
-               assert(pthread_mutex_lock(mutex) == 0);
+               if(pthread_mutex_lock(mutex) != 0) {
+                       abort();
+               }
 
                clock_gettime(EVENT_CLOCK, &loop->now);