X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.c;h=5a131b64875bb7e2317b2e83fe40fb427b387fe6;hb=fe1a9111456a73a6e690927e90d8bfa1e1d0ad22;hp=aa451801ea64742b5494785a1f378cee989a73e6;hpb=0b06e83440ca53357b154e0ce3094f6b67f93fa3;p=meshlink

diff --git a/src/event.c b/src/event.c
index aa451801..5a131b64 100644
--- a/src/event.c
+++ b/src/event.c
@@ -81,6 +81,8 @@ void io_del(event_loop_t *loop, io_t *io) {
 	if(!io->cb)
 		return;
 
+	loop->deletion = true;
+
 	io_set(loop, io, 0);
 
 	splay_unlink_node(&loop->ios, &io->node);
@@ -88,6 +90,9 @@ void io_del(event_loop_t *loop, io_t *io) {
 }
 
 void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb, void *data, struct timeval *tv) {
+	if(!timeout->cb)
+		timeout->tv = (struct timeval){0, 0};
+
 	timeout->cb = cb;
 	timeout->data = data;
 	timeout->node.data = timeout;
@@ -112,6 +117,8 @@ void timeout_del(event_loop_t *loop, timeout_t *timeout) {
 	if(!timeout->cb)
 		return;
 
+	loop->deletion = true;
+
 	splay_unlink_node(&loop->timeouts, &timeout->node);
 	timeout->cb = 0;
 	timeout->tv = (struct timeval){0, 0};
@@ -164,11 +171,18 @@ void signal_del(event_loop_t *loop, signal_t *sig) {
 	if(!sig->cb)
 		return;
 
+	loop->deletion = true;
+
 	splay_unlink_node(&loop->signals, &sig->node);
 	sig->cb = NULL;
 }
 
-bool event_loop_run(event_loop_t *loop) {
+void idle_set(event_loop_t *loop, idle_cb_t cb, void *data) {
+	loop->idle_cb = cb;
+	loop->idle_data = data;
+}
+
+bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
 	loop->running = true;
 
 	fd_set readable;
@@ -176,7 +190,7 @@ bool event_loop_run(event_loop_t *loop) {
 
 	while(loop->running) {
 		gettimeofday(&loop->now, NULL);
-		struct timeval diff, *tv = NULL;
+		struct timeval diff, it, *tv = NULL;
 
 		while(loop->timeouts.head) {
 			timeout_t *timeout = loop->timeouts.head->data;
@@ -192,6 +206,12 @@ bool event_loop_run(event_loop_t *loop) {
 			}
 		}
 
+		if(loop->idle_cb) {
+			it = loop->idle_cb(loop, loop->idle_data);
+			if(it.tv_sec >= 0 && (!tv || timercmp(&it, tv, <)))
+				tv = &it;
+		}
+
 		memcpy(&readable, &loop->readfds, sizeof readable);
 		memcpy(&writable, &loop->writefds, sizeof writable);
 
@@ -202,7 +222,12 @@ bool event_loop_run(event_loop_t *loop) {
 			fds = last->fd + 1;
 		}
 
+		// release mesh mutex during select
+		if(mutex)
+			pthread_mutex_unlock(mutex);
 		int n = select(fds, &readable, &writable, NULL, tv);
+		if(mutex)
+			pthread_mutex_lock(mutex);
 
 		if(n < 0) {
 			if(sockwouldblock(errno))
@@ -214,11 +239,21 @@ bool event_loop_run(event_loop_t *loop) {
 		if(!n)
 			continue;
 
+		// Normally, splay_each allows the current node to be deleted. However,
+		// it can be that one io callback triggers the deletion of another io,
+		// so we have to detect this and break the loop.
+
+		loop->deletion = false;
+
 		for splay_each(io_t, io, &loop->ios) {
-			if(FD_ISSET(io->fd, &writable))
+			if(FD_ISSET(io->fd, &writable) && io->cb)
 				io->cb(loop, io->data, IO_WRITE);
-			else if(FD_ISSET(io->fd, &readable))
+			if(loop->deletion)
+				break;
+			if(FD_ISSET(io->fd, &readable) && io->cb)
 				io->cb(loop, io->data, IO_READ);
+			if(loop->deletion)
+				break;
 		}
 	}