Fix compiling with -Wall -W.

[meshlink] / src / event.c

diff --git a/src/event.c b/src/event.c
index d1a0e2568ff1e9a928b89d510b996482f1ae55cb..54d696582f237711f796c7abdad2eee809029276 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -1,6 +1,6 @@
 /*
     event.c -- I/O, timeout and signal event handling
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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);
@@ -89,7 +91,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->tv = (struct timeval) {
+               0, 0
+       };
 
        timeout->cb = cb;
        timeout->data = data;
@@ -115,9 +119,13 @@ 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};
+       timeout->tv = (struct timeval) {
+               0, 0
+       };
 }
 
 static int signal_compare(const signal_t *a, const signal_t *b) {
@@ -125,11 +133,15 @@ static int signal_compare(const signal_t *a, const signal_t *b) {
 }
 
 static void signalio_handler(event_loop_t *loop, void *data, int flags) {
+       (void)data;
+       (void)flags;
        unsigned char signum;
        if(read(loop->pipefd[0], &signum, 1) != 1)
                return;
 
-       signal_t *sig = splay_search(&loop->signals, &((signal_t){.signum = signum}));
+       signal_t *sig = splay_search(&loop->signals, &((signal_t) {
+               .signum = signum
+       }));
        if(sig)
                sig->cb(loop, sig->data);
 }
@@ -167,19 +179,24 @@ 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) {
-       loop->running = true;
+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) {
        fd_set readable;
        fd_set writable;
 
        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;
@@ -195,8 +212,14 @@ bool event_loop_run(event_loop_t *loop) {
                        }
                }
 
-               memcpy(&readable, &loop->readfds, sizeof readable);
-               memcpy(&writable, &loop->writefds, sizeof writable);
+               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));
 
                int fds = 0;
 
@@ -205,7 +228,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))
@@ -217,11 +245,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;
                }
        }
 
@@ -234,6 +272,10 @@ void event_flush_output(event_loop_t *loop) {
                        io->cb(loop, io->data, IO_WRITE);
 }
 
+void event_loop_start(event_loop_t *loop) {
+       loop->running = true;
+}
+
 void event_loop_stop(event_loop_t *loop) {
        loop->running = false;
 }