projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence clang-tidy warnings about atoi(getenv())
[tinc]
/
src
/
event.c
diff --git
a/src/event.c
b/src/event.c
index
304360c
..
05ddb47
100644
(file)
--- 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
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,105
+19,119
@@
#include "system.h"
#include "system.h"
-#include "avl_tree.h"
#include "event.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 -1;
+ }
- return a->id - b->id;
-}
-
-void init_events(void) {
- cp();
+ if(a->event > b->event) {
+ return 1;
+ }
- event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
+ return 0;
+#endif
}
}
-void exit_events(void) {
- cp();
+static int timeout_compare(const timeout_t *a, const timeout_t *b) {
+ struct timeval diff;
+ timersub(&a->tv, &b->tv, &diff);
- avl_delete_tree(event_tree);
-}
+ if(diff.tv_sec < 0) {
+ return -1;
+ }
-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_usec < 0) {
+ return -1;
+ }
- cp();
+ if(diff.tv_usec > 0) {
+ return 1;
+ }
- if(!event_tree->tail)
-
return
;
+ uintptr_t ap = (uintptr_t)a;
+
uintptr_t bp = (uintptr_t)b
;
- event = event_tree->tail->data;
- if(event->time < now)
- return;
+ if(ap < bp) {
+ return -1;
+ }
- diff = 1 + event->time - now;
-
- for(node = event_tree->head; node; node = node->next) {
- event = node->data;
- event->time -= diff;
+ if(ap > bp) {
+ return 1;
}
}
+
+ return 0;
}
}
-event_t *new_event(void) {
-
cp()
;
+splay_tree_t io_tree = {.compare = (splay_compare_t)io_compare};
+
splay_tree_t timeout_tree = {.compare = (splay_compare_t)timeout_compare}
;
- return xmalloc_and_zero(sizeof(event_t));
+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 free_event(event_t *event) {
- cp();
+void timeout_set(timeout_t *timeout, const struct timeval *tv) {
+ if(timerisset(&timeout->tv)) {
+ splay_unlink_node(&timeout_tree, &timeout->node);
+ }
- free(event);
-}
+ if(!now.tv_sec) {
+ gettimeofday(&now, NULL);
+ }
-void event_add(event_t *event) {
- cp();
+ timeradd(&now, tv, &timeout->tv);
- event->id = ++id;
- avl_insert(event_tree, event);
+ if(!splay_insert_node(&timeout_tree, &timeout->node)) {
+ abort();
+ }
}
}
-void event_del(event_t *event) {
- cp();
+void timeout_del(timeout_t *timeout) {
+ if(!timeout->cb) {
+ return;
+ }
- avl_delete(event_tree, event);
+ 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;
- cp();
+ 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
;
}
}