#include "utils.h"
#include "xalloc.h"
-event_loop_t *loop;
-struct timeval now;
-
static int io_compare(const io_t *a, const io_t *b) {
return a->fd - b->fd;
}
if(!io->cb)
return;
+ loop->deletion = true;
+
io_set(loop, io, 0);
splay_unlink_node(&loop->ios, &io->node);
}
void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb, void *data, struct timeval *tv) {
+ if(!timeout->cb)
+ timeout->tv = (struct timeval){0, 0};
+
timeout->cb = cb;
timeout->data = data;
timeout->node.data = timeout;
if(!timeout->cb)
return;
+ loop->deletion = true;
+
splay_unlink_node(&loop->timeouts, &timeout->node);
timeout->cb = 0;
timeout->tv = (struct timeval){0, 0};
io_add(loop, &loop->signalio, signalio_handler, NULL, loop->pipefd[0], IO_READ);
}
+void signal_trigger(event_loop_t *loop, signal_t *sig) {
+
+ uint8_t signum = sig->signum;
+ write(loop->pipefd[1], &signum, 1);
+ return;
+
+}
+
void signal_add(event_loop_t *loop, signal_t *sig, signal_cb_t cb, void *data, uint8_t signum) {
if(sig->cb)
return;
if(!sig->cb)
return;
+ loop->deletion = true;
+
splay_unlink_node(&loop->signals, &sig->node);
sig->cb = NULL;
}
while(loop->running) {
gettimeofday(&loop->now, NULL);
- now = loop->now;
struct timeval diff, *tv = NULL;
while(loop->timeouts.head) {
if(!n)
continue;
+ // Normally, splay_each allows the current node to be deleted. However,
+ // it can be that one io callback triggers the deletion of another io,
+ // so we have to detect this and break the loop.
+
+ loop->deletion = false;
+
for splay_each(io_t, io, &loop->ios) {
- if(FD_ISSET(io->fd, &writable))
+ if(FD_ISSET(io->fd, &writable) && io->cb)
io->cb(loop, io->data, IO_WRITE);
- else if(FD_ISSET(io->fd, &readable))
+ if(loop->deletion)
+ break;
+ if(FD_ISSET(io->fd, &readable) && io->cb)
io->cb(loop, io->data, IO_READ);
+ if(loop->deletion)
+ break;
}
}
loop->signals.compare = (splay_compare_t)signal_compare;
loop->pipefd[0] = -1;
loop->pipefd[1] = -1;
+ gettimeofday(&loop->now, NULL);
}
void event_loop_exit(event_loop_t *loop) {
for splay_each(io_t, io, &loop->ios)
- splay_free_node(&loop->ios, node);
+ splay_unlink_node(&loop->ios, node);
for splay_each(timeout_t, timeout, &loop->timeouts)
- splay_free_node(&loop->timeouts, node);
+ splay_unlink_node(&loop->timeouts, node);
for splay_each(signal_t, signal, &loop->signals)
- splay_free_node(&loop->signals, node);
+ splay_unlink_node(&loop->signals, node);
}