X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.c;h=a7c1f25a3f3b9b05edd94a6ee579b818dd5b3412;hb=b16518ed4e156be37adc516eac603272f956298a;hp=5e9763e2702835672c760d93115787308726dab6;hpb=6558e508cc80ec97ec9c5bbcf7df922e13ed5b2e;p=meshlink

diff --git a/src/event.c b/src/event.c
index 5e9763e2..a7c1f25a 100644
--- a/src/event.c
+++ b/src/event.c
@@ -199,7 +199,9 @@ static void signalio_handler(event_loop_t *loop, void *data, int flags) {
 	});
 
 	if(sig) {
-		sig->set = false;
+#ifdef HAVE_STDATOMIC_H
+		atomic_flag_clear(&sig->set);
+#endif
 		sig->cb(loop, sig->data);
 	}
 }
@@ -224,12 +226,15 @@ static void pipe_exit(event_loop_t *loop) {
 }
 
 void signal_trigger(event_loop_t *loop, signal_t *sig) {
-	if(sig->set) {
+#ifdef HAVE_STDATOMIC_H
+
+	if(atomic_flag_test_and_set(&sig->set)) {
 		return;
 	}
 
+#endif
+
 	uint8_t signum = sig->signum;
-	sig->set = true;
 	write(loop->pipefd[1], &signum, 1);
 	return;
 }
@@ -240,9 +245,12 @@ 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;
 
+#ifdef HAVE_STDATOMIC_H
+	atomic_flag_clear(&sig->set);
+#endif
+
 	if(loop->pipefd[0] == -1) {
 		pipe_init(loop);
 	}
@@ -311,7 +319,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 +328,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);