projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename "event_t" to "tevent_t", along with associated functions.
[tinc]
/
src
/
tevent.c
diff --git
a/src/event.c
b/src/tevent.c
similarity index 68%
rename from
src/event.c
rename to
src/tevent.c
index
c791205
..
bdda639
100644
(file)
--- a/
src/event.c
+++ b/
src/tevent.c
@@
-23,16
+23,16
@@
#include "system.h"
#include "avl_tree.h"
#include "system.h"
#include "avl_tree.h"
-#include "event.h"
+#include "
t
event.h"
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-avl_tree_t *event_tree;
+avl_tree_t *
t
event_tree;
extern time_t now;
int id;
extern time_t now;
int id;
-static int
event_compare(const event_t *a, const
event_t *b)
+static int
tevent_compare(const tevent_t *a, const t
event_t *b)
{
if(a->time > b->time)
return 1;
{
if(a->time > b->time)
return 1;
@@
-43,24
+43,24
@@
static int event_compare(const event_t *a, const event_t *b)
return a->id - b->id;
}
return a->id - b->id;
}
-void init_events(void)
+void init_
t
events(void)
{
cp();
{
cp();
-
event_tree = avl_alloc_tree((avl_compare_t)
event_compare, NULL);
+
tevent_tree = avl_alloc_tree((avl_compare_t) t
event_compare, NULL);
}
}
-void exit_events(void)
+void exit_
t
events(void)
{
cp();
{
cp();
- avl_delete_tree(event_tree);
+ avl_delete_tree(
t
event_tree);
}
}
-void flush_events(void)
+void flush_
t
events(void)
{
avl_tree_t *to_flush;
{
avl_tree_t *to_flush;
- event_t *event;
+
t
event_t *event;
/*
* Events can be inserted from event handlers, so only flush events
/*
* Events can be inserted from event handlers, so only flush events
@@
-69,8
+69,8
@@
void flush_events(void)
cp();
cp();
- to_flush = event_tree;
- init_events();
+ to_flush =
t
event_tree;
+ init_
t
events();
while (to_flush->head) {
event = to_flush->head->data;
event->handler(event->data);
while (to_flush->head) {
event = to_flush->head->data;
event->handler(event->data);
@@
-79,46
+79,46
@@
void flush_events(void)
avl_delete_tree(to_flush);
}
avl_delete_tree(to_flush);
}
-
event_t *new_
event(void)
+
tevent_t *new_t
event(void)
{
cp();
{
cp();
- return xmalloc_and_zero(sizeof(event_t));
+ return xmalloc_and_zero(sizeof(
t
event_t));
}
}
-void free_
event(
event_t *event)
+void free_
tevent(t
event_t *event)
{
cp();
free(event);
}
{
cp();
free(event);
}
-void
event_add(
event_t *event)
+void
tevent_add(t
event_t *event)
{
cp();
event->id = ++id;
{
cp();
event->id = ++id;
- avl_insert(event_tree, event);
+ avl_insert(
t
event_tree, event);
}
}
-void
event_del(
event_t *event)
+void
tevent_del(t
event_t *event)
{
cp();
{
cp();
- avl_delete(event_tree, event);
+ avl_delete(
t
event_tree, event);
}
}
-
event_t *get_expired_
event(void)
+
tevent_t *get_expired_t
event(void)
{
{
- event_t *event;
+
t
event_t *event;
cp();
cp();
- if(event_tree->head) {
- event = event_tree->head->data;
+ if(
t
event_tree->head) {
+ event =
t
event_tree->head->data;
if(event->time < now) {
if(event->time < now) {
- event_del(event);
+
t
event_del(event);
return event;
}
}
return event;
}
}