/*
event.c -- event queue
- Copyright (C) 2002 Guus Sliepen <guus@sliepen.eu.org>,
- 2002 Ivo Timmermans <ivo@o2w.nl>
+ 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
it under the terms of the GNU General Public License as published by
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: event.c,v 1.1.4.7 2003/07/06 23:16:28 guus Exp $
+ $Id$
*/
-#include "config.h"
-
-#include <stdlib.h>
-#include <xalloc.h>
-#include <string.h>
-#include <utils.h>
-#include <avl_tree.h>
-#include <time.h>
+#include "system.h"
+#include "avl_tree.h"
#include "event.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
avl_tree_t *event_tree;
extern time_t now;
int id;
-static int event_compare(event_t *a, event_t *b)
+static int event_compare(const event_t *a, const event_t *b)
{
if(a->time > b->time)
return 1;
{
cp();
- event_tree = avl_alloc_tree((avl_compare_t) event_compare, NULL);
+ event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
}
void exit_events(void)
avl_delete_tree(event_tree);
}
+void expire_events(void)
+{
+ avl_node_t *node;
+ event_t *event;
+ time_t diff;
+
+ /*
+ * 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;
+ if(event->time < now)
+ return;
+
+ diff = 1 + event->time - now;
+
+ for(node = event_tree->head; node; node = node->next) {
+ event = node->data;
+ event->time -= diff;
+ }
+}
+
event_t *new_event(void)
{
cp();
- return (event_t *) xmalloc_and_zero(sizeof(event_t));
+ return xmalloc_and_zero(sizeof(event_t));
}
void free_event(event_t *event)
cp();
if(event_tree->head) {
- event = (event_t *) event_tree->head->data;
+ event = event_tree->head->data;
if(event->time < now) {
- avl_delete(event_tree, event);
+ avl_node_t *node = event_tree->head;
+ avl_unlink_node(event_tree, node);
+ free(node);
return event;
}
}