X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=6b730f6d153de426eb1f919638c590c626f3328c;hb=3847b78ba5900fe4311e9ef62474e32e1a6750e5;hp=89ee02292f76b4d75c1acfa7ade864ea34c77459;hpb=50af33d01f425983dd2b1d7b61092a6325be3f41;p=tinc

diff --git a/src/event.c b/src/event.c
index 89ee0229..6b730f6d 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,6 @@
 /*
-    event.c -- event queue
-    Copyright (C) 2002-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2005 Ivo Timmermans
+    event.c -- I/O, timeout and signal event handling
+    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -20,95 +19,232 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "dropin.h"
 #include "event.h"
+#include "net.h"
 #include "utils.h"
-#include "xalloc.h"
 
-avl_tree_t *event_tree;
-extern time_t now;
+struct timeval now;
 
-static int id;
+static fd_set readfds;
+static fd_set writefds;
+static volatile bool running;
 
-static int event_compare(const event_t *a, const event_t *b) {
-	if(a->time > b->time)
-		return 1;
+static int io_compare(const io_t *a, const io_t *b) {
+	return a->fd - b->fd;
+}
 
-	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(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;
+}
+
+static splay_tree_t io_tree = {.compare = (splay_compare_t)io_compare};
+static splay_tree_t timeout_tree = {.compare = (splay_compare_t)timeout_compare};
+
+void io_add(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;
 
-	return a->id - b->id;
+	io_set(io, flags);
+
+	if(!splay_insert_node(&io_tree, &io->node))
+		abort();
 }
 
-void init_events(void) {
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
+void io_set(io_t *io, int flags) {
+	io->flags = flags;
+
+	if(flags & IO_READ)
+		FD_SET(io->fd, &readfds);
+	else
+		FD_CLR(io->fd, &readfds);
+
+	if(flags & IO_WRITE)
+		FD_SET(io->fd, &writefds);
+	else
+		FD_CLR(io->fd, &writefds);
 }
 
-void exit_events(void) {
-	avl_delete_tree(event_tree);
+void io_del(io_t *io) {
+	if(!io->cb)
+		return;
+
+	io_set(io, 0);
+
+	splay_unlink_node(&io_tree, &io->node);
+	io->cb = NULL;
 }
 
-void expire_events(void) {
-	avl_node_t *node;
-	event_t *event;
-	time_t diff;
+void timeout_add(timeout_t *timeout, timeout_cb_t cb, void *data, struct timeval *tv) {
+	timeout->cb = cb;
+	timeout->data = data;
+	timeout->node.data = timeout;
 
-	/*
-	 * Make all events appear expired by substracting the difference between
-         * the expiration time of the last event and the current time.
-	 */
+	timeout_set(timeout, tv);
+}
 
-	if(!event_tree->tail)
-		return;
+void timeout_set(timeout_t *timeout, struct timeval *tv) {
+	if(timerisset(&timeout->tv))
+		splay_unlink_node(&timeout_tree, &timeout->node);
+
+	if(!now.tv_sec)
+		gettimeofday(&now, NULL);
+
+	timeradd(&now, tv, &timeout->tv);
+
+	if(!splay_insert_node(&timeout_tree, &timeout->node))
+		abort();
+}
 
-	event = event_tree->tail->data;
-	if(event->time <= now)
+void timeout_del(timeout_t *timeout) {
+	if(!timeout->cb)
 		return;
 
-	diff = event->time - now;
-	
-	for(node = event_tree->head; node; node = node->next) {
-		event = node->data;
-		event->time -= diff;
-	}
+	splay_unlink_node(&timeout_tree, &timeout->node);
+	timeout->cb = 0;
+	timeout->tv = (struct timeval){0, 0};
+}
+
+#ifndef HAVE_MINGW
+static int signal_compare(const signal_t *a, const signal_t *b) {
+	return a->signum - b->signum;
 }
 
-event_t *new_event(void) {
-	return xmalloc_and_zero(sizeof(event_t));
+static io_t signalio;
+static int pipefd[2] = {-1, -1};
+static splay_tree_t signal_tree = {.compare = (splay_compare_t)signal_compare};
+
+static void signal_handler(int signum) {
+	unsigned char num = signum;
+	write(pipefd[1], &num, 1);
 }
 
-void free_event(event_t *event) {
-	free(event);
+static void signalio_handler(void *data, int flags) {
+	unsigned char signum;
+	if(read(pipefd[0], &signum, 1) != 1)
+		return;
+
+	signal_t *sig = splay_search(&signal_tree, &((signal_t){.signum = signum}));
+	if(sig)
+		sig->cb(sig->data);
 }
 
-void event_add(event_t *event) {
-	event->id = ++id;
-	avl_insert(event_tree, event);
+static void pipe_init(void) {
+	if(!pipe(pipefd))
+		io_add(&signalio, signalio_handler, NULL, pipefd[0], IO_READ);
 }
 
-void event_del(event_t *event) {
-	avl_delete(event_tree, event);
+void signal_add(signal_t *sig, signal_cb_t cb, void *data, int signum) {
+	if(sig->cb)
+		return;
+
+	sig->cb = cb;
+	sig->data = data;
+	sig->signum = signum;
+	sig->node.data = sig;
+
+	if(pipefd[0] == -1)
+		pipe_init();
+
+	signal(sig->signum, signal_handler);
+
+	if(!splay_insert_node(&signal_tree, &sig->node))
+		abort();
 }
 
-event_t *get_expired_event(void) {
-	event_t *event;
+void signal_del(signal_t *sig) {
+	if(!sig->cb)
+		return;
+
+	signal(sig->signum, SIG_DFL);
+
+	splay_unlink_node(&signal_tree, &sig->node);
+	sig->cb = NULL;
+}
+#endif
+
+bool event_loop(void) {
+	running = true;
+
+	fd_set readable;
+	fd_set writable;
+
+	while(running) {
+		gettimeofday(&now, NULL);
+		struct timeval diff, *tv = NULL;
+
+		while(timeout_tree.head) {
+			timeout_t *timeout = timeout_tree.head->data;
+			timersub(&timeout->tv, &now, &diff);
+
+			if(diff.tv_sec < 0) {
+				timeout->cb(timeout->data);
+				if(timercmp(&timeout->tv, &now, <))
+					timeout_del(timeout);
+			} else {
+				tv = &diff;
+				break;
+			}
+		}
+
+		memcpy(&readable, &readfds, sizeof readable);
+		memcpy(&writable, &writefds, sizeof writable);
+
+		int fds = 0;
+
+		if(io_tree.tail) {
+			io_t *last = io_tree.tail->data;
+			fds = last->fd + 1;
+		}
+
+#ifdef HAVE_MINGW
+		LeaveCriticalSection(&mutex);
+#endif
+		int n = select(fds, &readable, &writable, NULL, tv);
+#ifdef HAVE_MINGW
+		EnterCriticalSection(&mutex);
+#endif
+
+		if(n < 0) {
+			if(sockwouldblock(errno))
+				continue;
+			else
+				return false;
+		}
 
-	if(event_tree->head) {
-		event = event_tree->head->data;
+		if(!n)
+			continue;
 
-		if(event->time <= now) {
-			avl_node_t *node = event_tree->head;
-			avl_unlink_node(event_tree, node);
-			free(node);
-			return event;
+		for splay_each(io_t, io, &io_tree) {
+			if(FD_ISSET(io->fd, &writable))
+				io->cb(io->data, IO_WRITE);
+			else if(FD_ISSET(io->fd, &readable))
+				io->cb(io->data, IO_READ);
 		}
 	}
 
-	return NULL;
+	return true;
 }
 
-event_t *peek_next_event(void) {
-	if (event_tree->head)
-		return event_tree->head->data;
-	return NULL;
+void event_exit(void) {
+	running = false;
 }