X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=56d8fa97e50294f28b2a5a21573694ede5c7d99d;hb=ce4d55b72fd4290d4710f10e755f6dd9ed039d88;hp=99e6a2381280c95d5365fce5020e8a450662d4f0;hpb=a227843b739d279b63adcf3736ebb03d856080c4;p=tinc

diff --git a/src/event.c b/src/event.c
index 99e6a238..56d8fa97 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 event handling
+    Copyright (C) 2012-2022 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,89 +19,116 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
 #include "event.h"
-#include "utils.h"
-#include "xalloc.h"
 
-avl_tree_t *event_tree;
-extern time_t now;
+struct timeval now;
 
-int id;
+static int io_compare(const io_t *a, const io_t *b) {
+#ifndef HAVE_WINDOWS
+	return a->fd - b->fd;
+#else
 
-static int event_compare(const event_t *a, const event_t *b) {
-	if(a->time > b->time)
-		return 1;
-
-	if(a->time < b->time)
+	if(a->event < b->event) {
 		return -1;
+	}
 
-	return a->id - b->id;
-}
+	if(a->event > b->event) {
+		return 1;
+	}
 
-void init_events(void) {
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
+	return 0;
+#endif
 }
 
-void exit_events(void) {
-	avl_delete_tree(event_tree);
-}
+static int timeout_compare(const timeout_t *a, const timeout_t *b) {
+	struct timeval diff;
+	timersub(&a->tv, &b->tv, &diff);
 
-void expire_events(void) {
-	avl_node_t *node;
-	event_t *event;
-	time_t diff;
+	if(diff.tv_sec < 0) {
+		return -1;
+	}
 
-	/*
-	 * Make all events appear expired by substracting the difference between
-         * the expiration time of the last event and the current time.
-	 */
+	if(diff.tv_sec > 0) {
+		return 1;
+	}
 
-	if(!event_tree->tail)
-		return;
+	if(diff.tv_usec < 0) {
+		return -1;
+	}
 
-	event = event_tree->tail->data;
-	if(event->time < now)
-		return;
+	if(diff.tv_usec > 0) {
+		return 1;
+	}
 
-	diff = 1 + event->time - now;
-	
-	for(node = event_tree->head; node; node = node->next) {
-		event = node->data;
-		event->time -= diff;
+	if(a < b) {
+		return -1;
+	}
+
+	if(a > b) {
+		return 1;
 	}
-}
 
-event_t *new_event(void) {
-	return xmalloc_and_zero(sizeof(event_t));
+	return 0;
 }
 
-void free_event(event_t *event) {
-	free(event);
+splay_tree_t io_tree = {.compare = (splay_compare_t)io_compare};
+splay_tree_t timeout_tree = {.compare = (splay_compare_t)timeout_compare};
+
+void timeout_add(timeout_t *timeout, timeout_cb_t cb, void *data, const struct timeval *tv) {
+	timeout->cb = cb;
+	timeout->data = data;
+	timeout->node.data = timeout;
+
+	timeout_set(timeout, tv);
 }
 
-void event_add(event_t *event) {
-	event->id = ++id;
-	avl_insert(event_tree, event);
+void timeout_set(timeout_t *timeout, const 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();
+	}
 }
 
-void event_del(event_t *event) {
-	avl_delete(event_tree, event);
+void timeout_del(timeout_t *timeout) {
+	if(!timeout->cb) {
+		return;
+	}
+
+	splay_unlink_node(&timeout_tree, &timeout->node);
+	timeout->cb = 0;
+	timeout->tv = (struct timeval) {
+		0, 0
+	};
 }
 
-event_t *get_expired_event(void) {
-	event_t *event;
+struct timeval *timeout_execute(struct timeval *diff) {
+	gettimeofday(&now, NULL);
+	struct timeval *tv = NULL;
+
+	while(timeout_tree.head) {
+		timeout_t *timeout = timeout_tree.head->data;
+		timersub(&timeout->tv, &now, diff);
 
-	if(event_tree->head) {
-		event = event_tree->head->data;
+		if(diff->tv_sec < 0) {
+			timeout->cb(timeout->data);
 
-		if(event->time < now) {
-			avl_node_t *node = event_tree->head;
-			avl_unlink_node(event_tree, node);
-			free(node);
-			return event;
+			if(timercmp(&timeout->tv, &now, <)) {
+				timeout_del(timeout);
+			}
+		} else {
+			tv = diff;
+			break;
 		}
 	}
 
-	return NULL;
+	return tv;
 }