Fix race condition when calling meshlink_stop() immediately after meshlink_start().

[meshlink] / src / event.c

diff --git a/src/event.c b/src/event.c
index 62daea6f13cf3a6138116e67773c1c60502bd22a..1f6ea186330ccdad0ea034c18ff621fc63febb04 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -177,15 +177,18 @@ void signal_del(event_loop_t *loop, signal_t *sig) {
        sig->cb = NULL;
 }
 
-bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
-       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;
@@ -201,6 +204,12 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
                        }
                }
 
+               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);
 
@@ -255,6 +264,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;
 }