Rename mesh_mutex to mutex.

[meshlink] / src / event.c

diff --git a/src/event.c b/src/event.c
index 61e6d8d7365893f53fffe50c4c6e07ee3b46ca22..90f56944fec9cc2a2251d2066630f736cccaac57 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -62,9 +62,7 @@ static int timeout_compare(const timeout_t *a, const timeout_t *b) {
 }
 
 void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags) {
-       if(io->cb) {
-               return;
-       }
+       assert(!io->cb);
 
        io->fd = fd;
        io->cb = cb;
@@ -73,12 +71,12 @@ void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int fl
 
        io_set(loop, io, flags);
 
-       if(!splay_insert_node(&loop->ios, &io->node)) {
-               abort();
-       }
+       assert(splay_insert_node(&loop->ios, &io->node));
 }
 
 void io_set(event_loop_t *loop, io_t *io, int flags) {
+       assert(io->cb);
+
        io->flags = flags;
 
        if(flags & IO_READ) {
@@ -95,9 +93,7 @@ void io_set(event_loop_t *loop, io_t *io, int flags) {
 }
 
 void io_del(event_loop_t *loop, io_t *io) {
-       if(!io->cb) {
-               return;
-       }
+       assert(io->cb);
 
        loop->deletion = true;
 
@@ -108,21 +104,16 @@ 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;
 
        timeout_set(loop, timeout, tv);
 }
 
 void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timeval *tv) {
+       assert(timeout->cb);
+
        if(timerisset(&timeout->tv)) {
                splay_unlink_node(&loop->timeouts, &timeout->node);
        }
@@ -136,6 +127,15 @@ void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timeval *tv) {
        if(!splay_insert_node(&loop->timeouts, &timeout->node)) {
                abort();
        }
+
+       loop->deletion = true;
+}
+
+static void timeout_disable(event_loop_t *loop, timeout_t *timeout) {
+       splay_unlink_node(&loop->timeouts, &timeout->node);
+       timeout->tv = (struct timeval) {
+               0, 0
+       };
 }
 
 void timeout_del(event_loop_t *loop, timeout_t *timeout) {
@@ -143,13 +143,12 @@ void timeout_del(event_loop_t *loop, timeout_t *timeout) {
                return;
        }
 
-       loop->deletion = true;
+       if(timerisset(&timeout->tv)) {
+               timeout_disable(loop, timeout);
+       }
 
-       splay_unlink_node(&loop->timeouts, &timeout->node);
-       timeout->cb = 0;
-       timeout->tv = (struct timeval) {
-               0, 0
-       };
+       timeout->cb = NULL;
+       loop->deletion = true;
 }
 
 static int signal_compare(const signal_t *a, const signal_t *b) {
@@ -175,9 +174,18 @@ static void signalio_handler(event_loop_t *loop, void *data, int flags) {
 }
 
 static void pipe_init(event_loop_t *loop) {
-       if(!pipe(loop->pipefd)) {
-               io_add(loop, &loop->signalio, signalio_handler, NULL, loop->pipefd[0], IO_READ);
-       }
+       assert(pipe(loop->pipefd) == 0);
+       io_add(loop, &loop->signalio, signalio_handler, NULL, loop->pipefd[0], IO_READ);
+}
+
+static void pipe_exit(event_loop_t *loop) {
+       io_del(loop, &loop->signalio);
+
+       close(loop->pipefd[0]);
+       close(loop->pipefd[1]);
+
+       loop->pipefd[0] = -1;
+       loop->pipefd[1] = -1;
 }
 
 void signal_trigger(event_loop_t *loop, signal_t *sig) {
@@ -187,9 +195,7 @@ void signal_trigger(event_loop_t *loop, signal_t *sig) {
 }
 
 void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, uint8_t signum) {
-       if(sig->cb) {
-               return;
-       }
+       assert(!sig->cb);
 
        sig->cb = cb;
        sig->data = data;
@@ -206,14 +212,16 @@ void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, u
 }
 
 void signal_del(event_loop_t *loop, signal_t *sig) {
-       if(!sig->cb) {
-               return;
-       }
+       assert(sig->cb);
 
        loop->deletion = true;
 
        splay_unlink_node(&loop->signals, &sig->node);
        sig->cb = NULL;
+
+       if(!loop->signals.count && loop->pipefd[0] != -1) {
+               pipe_exit(loop);
+       }
 }
 
 void idle_set(event_loop_t *loop, idle_cb_t cb, void *data) {
@@ -222,6 +230,8 @@ void idle_set(event_loop_t *loop, idle_cb_t cb, void *data) {
 }
 
 bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
+       assert(mutex);
+
        fd_set readable;
        fd_set writable;
 
@@ -234,11 +244,8 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
                        timersub(&timeout->tv, &loop->now, &diff);
 
                        if(diff.tv_sec < 0) {
+                               timeout_disable(loop, timeout);
                                timeout->cb(loop, timeout->data);
-
-                               if(timercmp(&timeout->tv, &loop->now, <)) {
-                                       timeout_del(loop, timeout);
-                               }
                        } else {
                                tv = &diff;
                                break;
@@ -264,15 +271,13 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
                }
 
                // release mesh mutex during select
-               if(mutex) {
-                       pthread_mutex_unlock(mutex);
-               }
+               pthread_mutex_unlock(mutex);
 
                int n = select(fds, &readable, &writable, NULL, tv);
 
-               if(mutex) {
-                       pthread_mutex_lock(mutex);
-               }
+               pthread_mutex_lock(mutex);
+
+               gettimeofday(&loop->now, NULL);
 
                if(n < 0) {
                        if(sockwouldblock(errno)) {
@@ -339,6 +344,10 @@ void event_loop_init(event_loop_t *loop) {
 }
 
 void event_loop_exit(event_loop_t *loop) {
+       assert(!loop->ios.count);
+       assert(!loop->timeouts.count);
+       assert(!loop->signals.count);
+
        for splay_each(io_t, io, &loop->ios) {
                splay_unlink_node(&loop->ios, node);
        }