X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.c;h=a7c1f25a3f3b9b05edd94a6ee579b818dd5b3412;hb=c31f626c3a252a0d6805a5f3ca9154d934ea41f5;hp=40dbd18e5e5cce004c3776b7574a02233c0b0636;hpb=f83d168f21b87170b5b02357c378c4b819080369;p=meshlink

diff --git a/src/event.c b/src/event.c
index 40dbd18e..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);
 	}
@@ -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
 
-		pthread_mutex_lock(mutex);
+		if(pthread_mutex_lock(mutex) != 0) {
+			abort();
+		}
 
 		clock_gettime(EVENT_CLOCK, &loop->now);
 
@@ -364,13 +374,6 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
 	return true;
 }
 
-void event_flush_output(event_loop_t *loop) {
-	for splay_each(io_t, io, &loop->ios)
-		if(FD_ISSET(io->fd, &loop->writefds)) {
-			io->cb(loop, io->data, IO_WRITE);
-		}
-}
-
 void event_loop_start(event_loop_t *loop) {
 	loop->running = true;
 }
@@ -394,14 +397,14 @@ void event_loop_exit(event_loop_t *loop) {
 	assert(!loop->signals.count);
 
 	for splay_each(io_t, io, &loop->ios) {
-		splay_unlink_node(&loop->ios, node);
+		splay_unlink_node(&loop->ios, splay_node);
 	}
 
 	for splay_each(timeout_t, timeout, &loop->timeouts) {
-		splay_unlink_node(&loop->timeouts, node);
+		splay_unlink_node(&loop->timeouts, splay_node);
 	}
 
 	for splay_each(signal_t, signal, &loop->signals) {
-		splay_unlink_node(&loop->signals, node);
+		splay_unlink_node(&loop->signals, splay_node);
 	}
 }