X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.h;h=4eb182518b350ba57cb7c036e0340f7c70e4ba6b;hb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;hp=25eb9667dea5d8147da4da95bb0f0fea85ad3818;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8;p=meshlink

diff --git a/src/event.h b/src/event.h
index 25eb9667..4eb18251 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,7 +1,6 @@
 /*
-    event.h -- header for event.c
-    Copyright (C) 2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2002 Ivo Timmermans <ivo@o2w.nl>
+    event.h -- I/O, timeout and signal event handling
+    Copyright (C) 2014 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
@@ -13,36 +12,82 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: event.h,v 1.1.4.4 2002/09/09 22:32:36 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
+#ifndef __MESHLINK_EVENT_H__
+#define __MESHLINK_EVENT_H__
+
+#include "splay_tree.h"
+#include "system.h"
+
+#define IO_READ 1
+#define IO_WRITE 2
+
+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 io_t {
+	int fd;
+	int flags;
+	io_cb_t cb;
+	void *data;
+	struct splay_node_t node;
+} io_t;
+
+typedef struct timeout_t {
+	struct timeval tv;
+	timeout_cb_t cb;
+	void *data;
+	struct splay_node_t node;
+} timeout_t;
+
+typedef struct signal_t {
+	int signum;
+	signal_cb_t cb;
+	void *data;
+	struct splay_node_t node;
+} signal_t;
 
-#include <time.h>
-#include <avl_tree.h>
+struct event_loop_t {
+	fd_set readfds;
+	fd_set writefds;
 
-avl_tree_t *event_tree;
+	volatile bool running;
+	struct timeval now;
+	bool deletion;
+	
+	splay_tree_t ios;
+	splay_tree_t timeouts;
+	splay_tree_t signals;
 
-typedef void (*event_handler_t)(void *);
+	io_t signalio;
+	int pipefd[2];
 
-typedef struct {
-	time_t time;
-	int id;
-	event_handler_t handler;
 	void *data;
-} event_t;
+};
+
+extern void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags);
+extern void io_del(event_loop_t *loop, io_t *io);
+extern void io_set(event_loop_t *loop, io_t *io, int flags);
+
+extern void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb, void *data, struct timeval *tv);
+extern void timeout_del(event_loop_t *loop, timeout_t *timeout);
+extern void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timeval *tv);
+
+extern void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, uint8_t signum);
+extern void signal_trigger(event_loop_t *loop, signal_t *sig);
+extern void signal_del(event_loop_t *loop, signal_t *sig);
 
-extern void init_events(void);
-extern void exit_events(void);
-extern event_t *new_event(void);
-extern void free_event(event_t *);
-extern void event_add(event_t *);
-extern void event_del(event_t *);
-extern event_t *get_expired_event(void);
+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, pthread_mutex_t *mutex);
+extern void event_loop_flush_output(event_loop_t *loop);
+extern void event_loop_stop(event_loop_t *loop);
 
-#endif							/* __TINC_EVENT_H__ */
+#endif