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

diff --git a/src/event.c b/src/event.c
index 304360c6..03efc675 100644
--- a/src/event.c
+++ b/src/event.c
@@ -20,13 +20,12 @@
 
 #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;
 
@@ -41,19 +40,15 @@ static int event_compare(const event_t *a, const event_t *b) {
 }
 
 void init_events(void) {
-	cp();
-
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
+	event_tree = splay_alloc_tree((splay_compare_t) event_compare, NULL);
 }
 
 void exit_events(void) {
-	cp();
-
-	avl_delete_tree(event_tree);
+	splay_delete_tree(event_tree);
 }
 
 void expire_events(void) {
-	avl_node_t *node;
+	splay_node_t *node;
 	event_t *event;
 	time_t diff;
 
@@ -62,12 +57,12 @@ void expire_events(void) {
          * 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;
 
@@ -80,41 +75,31 @@ void expire_events(void) {
 }
 
 event_t *new_event(void) {
-	cp();
-
 	return xmalloc_and_zero(sizeof(event_t));
 }
 
 void free_event(event_t *event) {
-	cp();
-
 	free(event);
 }
 
 void event_add(event_t *event) {
-	cp();
-
 	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);
+	splay_delete(event_tree, event);
 }
 
 event_t *get_expired_event(void) {
 	event_t *event;
 
-	cp();
-
 	if(event_tree->head) {
 		event = event_tree->head->data;
 
-		if(event->time < now) {
-			avl_node_t *node = event_tree->head;
-			avl_unlink_node(event_tree, node);
+		if(event->time < time(NULL)) {
+			splay_node_t *node = event_tree->head;
+			splay_unlink_node(event_tree, node);
 			free(node);
 			return event;
 		}