X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.c;h=6ca44d4898aa8d8110d728a2316a89d44fc39505;hb=185a8731839551fc9df7059ac374be5f5e35c086;hp=2ff09c670af83a27c4829567a74b176545d3fa2c;hpb=7926a156e5b118d06295228e57de0cc9de0433b4;p=meshlink

diff --git a/src/event.c b/src/event.c
index 2ff09c67..6ca44d48 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,6 @@
 /*
-    event.c -- event queue
-    Copyright (C) 2002-2004 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2004 Ivo Timmermans <ivo@tinc-vpn.org>
+    event.c -- 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,93 +12,286 @@
     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$
+    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.
 */
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "dropin.h"
 #include "event.h"
+#include "net.h"
+#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *event_tree;
-extern time_t now;
-
-int id;
+static int io_compare(const io_t *a, const io_t *b) {
+	return a->fd - b->fd;
+}
 
-static int event_compare(const event_t *a, const event_t *b)
-{
-	if(a->time > b->time)
+static int timeout_compare(const timeout_t *a, const timeout_t *b) {
+	struct timeval diff;
+	timersub(&a->tv, &b->tv, &diff);
+	if(diff.tv_sec < 0)
+		return -1;
+	if(diff.tv_sec > 0)
 		return 1;
-
-	if(a->time < b->time)
+	if(diff.tv_usec < 0)
+		return -1;
+	if(diff.tv_usec > 0)
+		return 1;
+	if(a < b)
 		return -1;
+	if(a > b)
+		return 1;
+	return 0;
+}
+
+void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags) {
+	if(io->cb)
+		return;
+
+	io->fd = fd;
+	io->cb = cb;
+	io->data = data;
+	io->node.data = io;
+
+	io_set(loop, io, flags);
 
-	return a->id - b->id;
+	if(!splay_insert_node(&loop->ios, &io->node))
+		abort();
 }
 
-void init_events(void)
-{
-	cp();
+void io_set(event_loop_t *loop, io_t *io, int flags) {
+	io->flags = flags;
 
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, NULL);
+	if(flags & IO_READ)
+		FD_SET(io->fd, &loop->readfds);
+	else
+		FD_CLR(io->fd, &loop->readfds);
+
+	if(flags & IO_WRITE)
+		FD_SET(io->fd, &loop->writefds);
+	else
+		FD_CLR(io->fd, &loop->writefds);
 }
 
-void exit_events(void)
-{
-	cp();
+void io_del(event_loop_t *loop, io_t *io) {
+	if(!io->cb)
+		return;
+
+	loop->deletion = true;
 
-	avl_delete_tree(event_tree);
+	io_set(loop, io, 0);
+
+	splay_unlink_node(&loop->ios, &io->node);
+	io->cb = NULL;
 }
 
-event_t *new_event(void)
-{
-	cp();
+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) {
+	if(timerisset(&timeout->tv))
+		splay_unlink_node(&loop->timeouts, &timeout->node);
+
+	if(!loop->now.tv_sec)
+		gettimeofday(&loop->now, NULL);
+
+	timeradd(&loop->now, tv, &timeout->tv);
+
+	if(!splay_insert_node(&loop->timeouts, &timeout->node))
+		abort();
+}
+
+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
+	};
+}
+
+static int signal_compare(const signal_t *a, const signal_t *b) {
+	return (int)a->signum - (int)b->signum;
+}
+
+static void signalio_handler(event_loop_t *loop, void *data, int flags) {
+	unsigned char signum;
+	if(read(loop->pipefd[0], &signum, 1) != 1)
+		return;
+
+	signal_t *sig = splay_search(&loop->signals, &((signal_t) {
+		.signum = signum
+	}));
+	if(sig)
+		sig->cb(loop, sig->data);
+}
 
-	return xmalloc_and_zero(sizeof(event_t));
+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);
 }
 
-void free_event(event_t *event)
-{
-	cp();
+void signal_trigger(event_loop_t *loop, signal_t *sig) {
+
+	uint8_t signum = sig->signum;
+	write(loop->pipefd[1], &signum, 1);
+	return;
 
-	free(event);
 }
 
-void event_add(event_t *event)
-{
-	cp();
+void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, uint8_t signum) {
+	if(sig->cb)
+		return;
+
+	sig->cb = cb;
+	sig->data = data;
+	sig->signum = signum;
+	sig->node.data = sig;
+
+	if(loop->pipefd[0] == -1)
+		pipe_init(loop);
 
-	event->id = ++id;
-	avl_insert(event_tree, event);
+	if(!splay_insert_node(&loop->signals, &sig->node))
+		abort();
 }
 
-void event_del(event_t *event)
-{
-	cp();
+void signal_del(event_loop_t *loop, signal_t *sig) {
+	if(!sig->cb)
+		return;
 
-	avl_delete(event_tree, event);
+	loop->deletion = true;
+
+	splay_unlink_node(&loop->signals, &sig->node);
+	sig->cb = NULL;
+}
+
+void idle_set(event_loop_t *loop, idle_cb_t cb, void *data) {
+	loop->idle_cb = cb;
+	loop->idle_data = data;
 }
 
-event_t *get_expired_event(void)
-{
-	event_t *event;
+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, it, *tv = NULL;
 
-	cp();
+		while(loop->timeouts.head) {
+			timeout_t *timeout = loop->timeouts.head->data;
+			timersub(&timeout->tv, &loop->now, &diff);
+
+			if(diff.tv_sec < 0) {
+				timeout->cb(loop, timeout->data);
+				if(timercmp(&timeout->tv, &loop->now, <))
+					timeout_del(loop, timeout);
+			} else {
+				tv = &diff;
+				break;
+			}
+		}
+
+		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;
+
+		if(loop->ios.tail) {
+			io_t *last = loop->ios.tail->data;
+			fds = last->fd + 1;
+		}
 
-	if(event_tree->head) {
-		event = event_tree->head->data;
+		// 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(event->time < now) {
-			avl_delete(event_tree, event);
-			return event;
+		if(n < 0) {
+			if(sockwouldblock(errno))
+				continue;
+			else
+				return false;
+		}
+
+		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) && io->cb)
+				io->cb(loop, io->data, IO_WRITE);
+			if(loop->deletion)
+				break;
+			if(FD_ISSET(io->fd, &readable) && io->cb)
+				io->cb(loop, io->data, IO_READ);
+			if(loop->deletion)
+				break;
 		}
 	}
 
-	return NULL;
+	return true;
+}
+
+void event_flush_output(event_loop_t *loop) {
+	for splay_each(io_t, io, &loop->ios)
+		if(FD_ISSET(io->fd, &loop->writefds))
+			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;
+}
+
+void event_loop_init(event_loop_t *loop) {
+	loop->ios.compare = (splay_compare_t)io_compare;
+	loop->timeouts.compare = (splay_compare_t)timeout_compare;
+	loop->signals.compare = (splay_compare_t)signal_compare;
+	loop->pipefd[0] = -1;
+	loop->pipefd[1] = -1;
+	gettimeofday(&loop->now, NULL);
+}
+
+void event_loop_exit(event_loop_t *loop) {
+	for splay_each(io_t, io, &loop->ios)
+		splay_unlink_node(&loop->ios, node);
+	for splay_each(timeout_t, timeout, &loop->timeouts)
+		splay_unlink_node(&loop->timeouts, node);
+	for splay_each(signal_t, signal, &loop->signals)
+		splay_unlink_node(&loop->signals, node);
 }