static int timeout_compare(const timeout_t *a, const timeout_t *b) {
struct timeval diff;
timersub(&a->tv, &b->tv, &diff);
- if(diff.tv_sec < 0)
+
+ if(diff.tv_sec < 0) {
return -1;
- if(diff.tv_sec > 0)
+ }
+
+ if(diff.tv_sec > 0) {
return 1;
- if(diff.tv_usec < 0)
+ }
+
+ if(diff.tv_usec < 0) {
return -1;
- if(diff.tv_usec > 0)
+ }
+
+ if(diff.tv_usec > 0) {
return 1;
- if(a < b)
+ }
+
+ if(a < b) {
return -1;
- if(a > b)
+ }
+
+ if(a > b) {
return 1;
+ }
+
return 0;
}
void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags) {
- if(io->cb)
- return;
+ assert(!io->cb);
io->fd = fd;
io->cb = cb;
io_set(loop, io, flags);
- if(!splay_insert_node(&loop->ios, &io->node))
- abort();
+ splay_node_t *node = splay_insert_node(&loop->ios, &io->node);
+ assert(node);
}
void io_set(event_loop_t *loop, io_t *io, int flags) {
+ assert(io->cb);
+
io->flags = flags;
- if(flags & IO_READ)
+ if(flags & IO_READ) {
FD_SET(io->fd, &loop->readfds);
- else
+ } else {
FD_CLR(io->fd, &loop->readfds);
+ }
- if(flags & IO_WRITE)
+ if(flags & IO_WRITE) {
FD_SET(io->fd, &loop->writefds);
- else
+ } else {
FD_CLR(io->fd, &loop->writefds);
+ }
}
void io_del(event_loop_t *loop, io_t *io) {
- if(!io->cb)
- return;
+ assert(io->cb);
loop->deletion = true;
}
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;
}
void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timeval *tv) {
- if(timerisset(&timeout->tv))
+ assert(timeout->cb);
+
+ if(timerisset(&timeout->tv)) {
splay_unlink_node(&loop->timeouts, &timeout->node);
+ }
- if(!loop->now.tv_sec)
+ if(!loop->now.tv_sec) {
gettimeofday(&loop->now, NULL);
+ }
timeradd(&loop->now, tv, &timeout->tv);
- if(!splay_insert_node(&loop->timeouts, &timeout->node))
+ if(!splay_insert_node(&loop->timeouts, &timeout->node)) {
abort();
-}
-
-void timeout_del(event_loop_t *loop, timeout_t *timeout) {
- if(!timeout->cb)
- return;
+ }
loop->deletion = true;
+}
+static void timeout_disable(event_loop_t *loop, timeout_t *timeout) {
splay_unlink_node(&loop->timeouts, &timeout->node);
- timeout->cb = 0;
timeout->tv = (struct timeval) {
0, 0
};
}
+void timeout_del(event_loop_t *loop, timeout_t *timeout) {
+ if(!timeout->cb) {
+ return;
+ }
+
+ if(timerisset(&timeout->tv)) {
+ timeout_disable(loop, timeout);
+ }
+
+ timeout->cb = NULL;
+ loop->deletion = true;
+}
+
static int signal_compare(const signal_t *a, const signal_t *b) {
return (int)a->signum - (int)b->signum;
}
(void)data;
(void)flags;
unsigned char signum;
- if(read(loop->pipefd[0], &signum, 1) != 1)
+
+ if(read(loop->pipefd[0], &signum, 1) != 1) {
return;
+ }
- signal_t *sig = splay_search(&loop->signals, &((signal_t) {
+ signal_t *sig = splay_search(&loop->signals, &(signal_t) {
.signum = signum
- }));
- if(sig)
+ });
+
+ if(sig) {
sig->cb(loop, sig->data);
+ }
}
static void pipe_init(event_loop_t *loop) {
- if(!pipe(loop->pipefd))
+ int result = pipe(loop->pipefd);
+ assert(result == 0);
+
+ if(result == 0) {
io_add(loop, &loop->signalio, signalio_handler, NULL, loop->pipefd[0], IO_READ);
+ }
}
-void signal_trigger(event_loop_t *loop, signal_t *sig) {
+static void pipe_exit(event_loop_t *loop) {
+ io_del(loop, &loop->signalio);
+
+ close(loop->pipefd[0]);
+ close(loop->pipefd[1]);
+ loop->pipefd[0] = -1;
+ loop->pipefd[1] = -1;
+}
+
+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;
+ assert(!sig->cb);
sig->cb = cb;
sig->data = data;
sig->signum = signum;
sig->node.data = sig;
- if(loop->pipefd[0] == -1)
+ if(loop->pipefd[0] == -1) {
pipe_init(loop);
+ }
- if(!splay_insert_node(&loop->signals, &sig->node))
+ if(!splay_insert_node(&loop->signals, &sig->node)) {
abort();
+ }
}
void signal_del(event_loop_t *loop, signal_t *sig) {
- if(!sig->cb)
- return;
+ assert(sig->cb);
loop->deletion = true;
splay_unlink_node(&loop->signals, &sig->node);
sig->cb = NULL;
+
+ if(!loop->signals.count && loop->pipefd[0] != -1) {
+ pipe_exit(loop);
+ }
}
void idle_set(event_loop_t *loop, idle_cb_t cb, void *data) {
}
bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
+ assert(mutex);
+
fd_set readable;
fd_set writable;
timersub(&timeout->tv, &loop->now, &diff);
if(diff.tv_sec < 0) {
+ timeout_disable(loop, timeout);
timeout->cb(loop, timeout->data);
- if(timercmp(&timeout->tv, &loop->now, <))
- timeout_del(loop, timeout);
} else {
tv = &diff;
break;
if(loop->idle_cb) {
it = loop->idle_cb(loop, loop->idle_data);
- if(it.tv_sec >= 0 && (!tv || timercmp(&it, tv, <)))
+
+ if(it.tv_sec >= 0 && (!tv || timercmp(&it, tv, <))) {
tv = ⁢
+ }
}
memcpy(&readable, &loop->readfds, sizeof(readable));
}
// release mesh mutex during select
- if(mutex)
- pthread_mutex_unlock(mutex);
+ pthread_mutex_unlock(mutex);
+
int n = select(fds, &readable, &writable, NULL, tv);
- if(mutex)
- pthread_mutex_lock(mutex);
+
+ pthread_mutex_lock(mutex);
+
+ gettimeofday(&loop->now, NULL);
if(n < 0) {
- if(sockwouldblock(errno))
+ if(sockwouldblock(errno)) {
continue;
- else
+ } else {
return false;
+ }
}
- if(!n)
+ 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,
loop->deletion = false;
for splay_each(io_t, io, &loop->ios) {
- if(FD_ISSET(io->fd, &writable) && io->cb)
+ if(FD_ISSET(io->fd, &writable) && io->cb) {
io->cb(loop, io->data, IO_WRITE);
- if(loop->deletion)
+ }
+
+ if(loop->deletion) {
break;
- if(FD_ISSET(io->fd, &readable) && io->cb)
+ }
+
+ if(FD_ISSET(io->fd, &readable) && io->cb) {
io->cb(loop, io->data, IO_READ);
- if(loop->deletion)
+ }
+
+ if(loop->deletion) {
break;
+ }
}
}
void event_flush_output(event_loop_t *loop) {
for splay_each(io_t, io, &loop->ios)
- if(FD_ISSET(io->fd, &loop->writefds))
+ if(FD_ISSET(io->fd, &loop->writefds)) {
io->cb(loop, io->data, IO_WRITE);
+ }
}
void event_loop_start(event_loop_t *loop) {
}
void event_loop_exit(event_loop_t *loop) {
- for splay_each(io_t, io, &loop->ios)
+ assert(!loop->ios.count);
+ assert(!loop->timeouts.count);
+ assert(!loop->signals.count);
+
+ for splay_each(io_t, io, &loop->ios) {
splay_unlink_node(&loop->ios, node);
- for splay_each(timeout_t, timeout, &loop->timeouts)
+ }
+
+ for splay_each(timeout_t, timeout, &loop->timeouts) {
splay_unlink_node(&loop->timeouts, node);
- for splay_each(signal_t, signal, &loop->signals)
+ }
+
+ for splay_each(signal_t, signal, &loop->signals) {
splay_unlink_node(&loop->signals, node);
+ }
}