X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=03efc675b20f7a480a70167abbfd0e99f514808c;hb=15a110013b50c53e4d943b9251ed94d0cbdfea85;hp=8a63e12d39fa4d598f8daef9b51016e3d87a9466;hpb=e9576632dc4b780b867044269d06cc50f76d8c05;p=tinc

diff --git a/src/event.c b/src/event.c
index 8a63e12d..03efc675 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,6 +1,6 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002-2007 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2002-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2002-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -13,27 +13,23 @@
     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 "splay_tree.h"
 #include "event.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *event_tree;
-extern time_t now;
+splay_tree_t *event_tree;
 
 int id;
 
-static int event_compare(const event_t *a, const event_t *b)
-{
+static int event_compare(const event_t *a, const event_t *b) {
 	if(a->time > b->time)
 		return 1;
 
@@ -43,82 +39,68 @@ static int event_compare(const event_t *a, const event_t *b)
 	return a->id - b->id;
 }
 
-void init_events(void)
-{
-	cp();
-
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, NULL);
+void init_events(void) {
+	event_tree = splay_alloc_tree((splay_compare_t) event_compare, NULL);
 }
 
-void exit_events(void)
-{
-	cp();
-
-	avl_delete_tree(event_tree);
+void exit_events(void) {
+	splay_delete_tree(event_tree);
 }
 
-void flush_events(void)
-{
-	avl_tree_t *to_flush;
+void expire_events(void) {
+	splay_node_t *node;
 	event_t *event;
+	time_t diff;
 
 	/*
-	 * Events can be inserted from event handlers, so only flush events
-	 * already in the priority queue.
+	 * Make all events appear expired by substracting the difference between
+         * the expiration time of the last event and the current time.
 	 */
 
-	cp();
+	if(!event_tree->tail)
+		return;
+
+	event = event_tree->tail->data;
+	time_t now = time(NULL);
+
+	if(event->time < now)
+		return;
 
-	to_flush = event_tree;
-	init_events();
-	while (to_flush->head) {
-		event = to_flush->head->data;
-		event->handler(event->data);
-		avl_delete(to_flush, event);
+	diff = 1 + event->time - now;
+	
+	for(node = event_tree->head; node; node = node->next) {
+		event = node->data;
+		event->time -= diff;
 	}
-	avl_delete_tree(to_flush);
 }
 
-event_t *new_event(void)
-{
-	cp();
-
+event_t *new_event(void) {
 	return xmalloc_and_zero(sizeof(event_t));
 }
 
-void free_event(event_t *event)
-{
-	cp();
-
+void free_event(event_t *event) {
 	free(event);
 }
 
-void event_add(event_t *event)
-{
-	cp();
-
+void event_add(event_t *event) {
 	event->id = ++id;
-	avl_insert(event_tree, event);
+	splay_insert(event_tree, event);
 }
 
-void event_del(event_t *event)
-{
-	cp();
-
-	avl_delete(event_tree, event);
+void event_del(event_t *event) {
+	splay_delete(event_tree, event);
 }
 
-event_t *get_expired_event(void)
-{
+event_t *get_expired_event(void) {
 	event_t *event;
 
-	cp();
-
 	if(event_tree->head) {
 		event = event_tree->head->data;
 
-		if(event->time < now) {
-			event_del(event);
+		if(event->time < time(NULL)) {
+			splay_node_t *node = event_tree->head;
+			splay_unlink_node(event_tree, node);
+			free(node);
 			return event;
 		}
 	}