#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;
}
void init_events(void) {
- 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) {
- 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;
return;
event = event_tree->tail->data;
+ time_t now = time(NULL);
+
if(event->time < now)
return;
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) {
- avl_delete(event_tree, event);
+ splay_delete(event_tree, event);
}
event_t *get_expired_event(void) {
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;
}