Take the global lock in meshlink_channel_send().

[meshlink] / src / event.h

diff --git a/src/event.h b/src/event.h
index e49732af7062871c4dea91908aad9290e898ed60..53559f80368bcf6606c3e440a917399e57fbf40e 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -21,6 +21,7 @@
 #define __MESHLINK_EVENT_H__
 
 #include "splay_tree.h"
+#include "system.h"
 
 #define IO_READ 1
 #define IO_WRITE 2
@@ -30,6 +31,7 @@ typedef struct event_loop_t event_loop_t;
 typedef void (*io_cb_t)(event_loop_t *loop, void *data, int flags);
 typedef void (*timeout_cb_t)(event_loop_t *loop, void *data);
 typedef void (*signal_cb_t)(event_loop_t *loop, void *data);
+typedef struct timeval (*idle_cb_t)(event_loop_t *loop, void *data);
 
 typedef struct io_t {
        int fd;
@@ -59,11 +61,15 @@ struct event_loop_t {
 
        volatile bool running;
        struct timeval now;
+       bool deletion;
        
        splay_tree_t ios;
        splay_tree_t timeouts;
        splay_tree_t signals;
 
+       idle_cb_t idle_cb;
+       void *idle_data;
+
        io_t signalio;
        int pipefd[2];
 
@@ -82,9 +88,11 @@ extern void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *
 extern void signal_trigger(event_loop_t *loop, signal_t *sig);
 extern void signal_del(event_loop_t *loop, signal_t *sig);
 
+extern void idle_set(event_loop_t *loop, idle_cb_t cb, void *data);
+
 extern void event_loop_init(event_loop_t *loop);
 extern void event_loop_exit(event_loop_t *loop);
-extern bool event_loop_run(event_loop_t *loop);
+extern bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex);
 extern void event_loop_flush_output(event_loop_t *loop);
 extern void event_loop_stop(event_loop_t *loop);