X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fevent.c;h=39a7d18f6dea3d00c4fa4382b6a8341299f59d43;hb=8d4b96efb7955eaa96174af4804597f92e124041;hp=739ff35de5a595b76fee4f56ed43ca42b31e9e4c;hpb=4c57e6902219ecca1872e18e34365d8e54a0f407;p=meshlink

diff --git a/src/event.c b/src/event.c
index 739ff35d..39a7d18f 100644
--- a/src/event.c
+++ b/src/event.c
@@ -64,10 +64,6 @@ static void timespec_clear(struct timespec *a) {
 	a->tv_sec = 0;
 }
 
-static bool timespec_isset(const struct timespec *a) {
-	return a->tv_sec;
-}
-
 static int io_compare(const io_t *a, const io_t *b) {
 	return a->fd - b->fd;
 }
@@ -137,7 +133,6 @@ void io_del(event_loop_t *loop, io_t *io) {
 void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb, void *data, struct timespec *tv) {
 	timeout->cb = cb;
 	timeout->data = data;
-	timeout->node.data = timeout;
 
 	timeout_set(loop, timeout, tv);
 }
@@ -145,8 +140,10 @@ void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb, void *
 void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timespec *tv) {
 	assert(timeout->cb);
 
-	if(timespec_isset(&timeout->tv)) {
+	if(timeout->node.data) {
 		splay_unlink_node(&loop->timeouts, &timeout->node);
+	} else {
+		timeout->node.data = timeout;
 	}
 
 	if(!loop->now.tv_sec) {
@@ -163,7 +160,11 @@ void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timespec *tv) {
 }
 
 static void timeout_disable(event_loop_t *loop, timeout_t *timeout) {
-	splay_unlink_node(&loop->timeouts, &timeout->node);
+	if(timeout->node.data) {
+		splay_unlink_node(&loop->timeouts, &timeout->node);
+		timeout->node.data = NULL;
+	}
+
 	timespec_clear(&timeout->tv);
 }
 
@@ -172,7 +173,7 @@ void timeout_del(event_loop_t *loop, timeout_t *timeout) {
 		return;
 	}
 
-	if(timespec_isset(&timeout->tv)) {
+	if(timeout->node.data) {
 		timeout_disable(loop, timeout);
 	}
 
@@ -363,13 +364,6 @@ bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
 	return true;
 }
 
-void event_flush_output(event_loop_t *loop) {
-	for splay_each(io_t, io, &loop->ios)
-		if(FD_ISSET(io->fd, &loop->writefds)) {
-			io->cb(loop, io->data, IO_WRITE);
-		}
-}
-
 void event_loop_start(event_loop_t *loop) {
 	loop->running = true;
 }
@@ -393,14 +387,14 @@ void event_loop_exit(event_loop_t *loop) {
 	assert(!loop->signals.count);
 
 	for splay_each(io_t, io, &loop->ios) {
-		splay_unlink_node(&loop->ios, node);
+		splay_unlink_node(&loop->ios, splay_node);
 	}
 
 	for splay_each(timeout_t, timeout, &loop->timeouts) {
-		splay_unlink_node(&loop->timeouts, node);
+		splay_unlink_node(&loop->timeouts, splay_node);
 	}
 
 	for splay_each(signal_t, signal, &loop->signals) {
-		splay_unlink_node(&loop->signals, node);
+		splay_unlink_node(&loop->signals, splay_node);
 	}
 }