#include "dropin.h"
#include "event.h"
+#include "logger.h"
+#include "meshlink.h"
#include "net.h"
#include "splay_tree.h"
#include "utils.h"
#include "xalloc.h"
-static int io_compare(const io_t *a, const io_t *b) {
- return a->fd - b->fd;
-}
+#ifndef EVENT_CLOCK
+#if defined(CLOCK_MONOTONIC_RAW) && defined(__x86_64__)
+#define EVENT_CLOCK CLOCK_MONOTONIC_RAW
+#else
+#define EVENT_CLOCK CLOCK_MONOTONIC
+#endif
+#endif
-static int timeout_compare(const timeout_t *a, const timeout_t *b) {
- struct timeval diff;
- timersub(&a->tv, &b->tv, &diff);
+static void timespec_add(const struct timespec *a, const struct timespec *b, struct timespec *r) {
+ r->tv_sec = a->tv_sec + b->tv_sec;
+ r->tv_nsec = a->tv_nsec + b->tv_nsec;
- if(diff.tv_sec < 0) {
- return -1;
+ if(r->tv_nsec > 1000000000) {
+ r->tv_sec++, r->tv_nsec -= 1000000000;
}
+}
- if(diff.tv_sec > 0) {
- return 1;
- }
+static void timespec_sub(const struct timespec *a, const struct timespec *b, struct timespec *r) {
+ r->tv_sec = a->tv_sec - b->tv_sec;
+ r->tv_nsec = a->tv_nsec - b->tv_nsec;
- if(diff.tv_usec < 0) {
- return -1;
+ if(r->tv_nsec < 0) {
+ r->tv_sec--, r->tv_nsec += 1000000000;
}
+}
- if(diff.tv_usec > 0) {
- return 1;
+static bool timespec_lt(const struct timespec *a, const struct timespec *b) {
+ if(a->tv_sec == b->tv_sec) {
+ return a->tv_nsec < b->tv_nsec;
+ } else {
+ return a->tv_sec < b->tv_sec;
}
+}
- if(a < b) {
- return -1;
- }
+static void timespec_clear(struct timespec *a) {
+ a->tv_sec = 0;
+}
- if(a > b) {
+static int io_compare(const io_t *a, const io_t *b) {
+ return a->fd - b->fd;
+}
+
+static int timeout_compare(const timeout_t *a, const timeout_t *b) {
+ if(a->tv.tv_sec < b->tv.tv_sec) {
+ return -1;
+ } else if(a->tv.tv_sec > b->tv.tv_sec) {
+ return 1;
+ } else if(a->tv.tv_nsec < b->tv.tv_nsec) {
+ return -1;
+ } else if(a->tv.tv_nsec > b->tv.tv_nsec) {
+ return 1;
+ } else if(a < b) {
+ return -1;
+ } else if(a > b) {
return 1;
+ } else {
+ return 0;
}
-
- return 0;
}
void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags) {
io_set(loop, io, flags);
- assert(splay_insert_node(&loop->ios, &io->node));
+ splay_node_t *node = splay_insert_node(&loop->ios, &io->node);
+ assert(node);
+ (void)node;
}
void io_set(event_loop_t *loop, io_t *io, int flags) {
io->cb = NULL;
}
-void timeout_add(event_loop_t *loop, timeout_t *timeout, timeout_cb_t cb, void *data, struct timeval *tv) {
+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);
}
-void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timeval *tv) {
+void timeout_set(event_loop_t *loop, timeout_t *timeout, struct timespec *tv) {
assert(timeout->cb);
- if(timerisset(&timeout->tv)) {
+ if(timeout->node.data) {
splay_unlink_node(&loop->timeouts, &timeout->node);
+ } else {
+ timeout->node.data = timeout;
}
if(!loop->now.tv_sec) {
- gettimeofday(&loop->now, NULL);
+ clock_gettime(EVENT_CLOCK, &loop->now);
}
- timeradd(&loop->now, tv, &timeout->tv);
+ timespec_add(&loop->now, tv, &timeout->tv);
if(!splay_insert_node(&loop->timeouts, &timeout->node)) {
abort();
}
static void timeout_disable(event_loop_t *loop, timeout_t *timeout) {
- splay_unlink_node(&loop->timeouts, &timeout->node);
- timeout->tv = (struct timeval) {
- 0, 0
- };
+ if(timeout->node.data) {
+ splay_unlink_node(&loop->timeouts, &timeout->node);
+ timeout->node.data = NULL;
+ }
+
+ timespec_clear(&timeout->tv);
}
void timeout_del(event_loop_t *loop, timeout_t *timeout) {
return;
}
- if(timerisset(&timeout->tv)) {
+ if(timeout->node.data) {
timeout_disable(loop, timeout);
}
return;
}
- signal_t *sig = splay_search(&loop->signals, &((signal_t) {
+ signal_t *sig = splay_search(&loop->signals, &(signal_t) {
.signum = signum
- }));
+ });
if(sig) {
+#ifdef HAVE_STDATOMIC_H
+ atomic_flag_clear(&sig->set);
+#endif
sig->cb(loop, sig->data);
}
}
static void pipe_init(event_loop_t *loop) {
- assert(pipe(loop->pipefd) == 0);
- io_add(loop, &loop->signalio, signalio_handler, NULL, loop->pipefd[0], IO_READ);
+ int result = pipe(loop->pipefd);
+ assert(result == 0);
+
+ if(result == 0) {
+#ifdef O_NONBLOCK
+ fcntl(loop->pipefd[0], F_SETFL, O_NONBLOCK);
+ fcntl(loop->pipefd[1], F_SETFL, O_NONBLOCK);
+#endif
+ io_add(loop, &loop->signalio, signalio_handler, NULL, loop->pipefd[0], IO_READ);
+ }
}
static void pipe_exit(event_loop_t *loop) {
}
void signal_trigger(event_loop_t *loop, signal_t *sig) {
+#ifdef HAVE_STDATOMIC_H
+
+ if(atomic_flag_test_and_set(&sig->set)) {
+ return;
+ }
+
+#endif
+
uint8_t signum = sig->signum;
write(loop->pipefd[1], &signum, 1);
return;
sig->signum = signum;
sig->node.data = sig;
+#ifdef HAVE_STDATOMIC_H
+ atomic_flag_clear(&sig->set);
+#endif
+
if(loop->pipefd[0] == -1) {
pipe_init(loop);
}
loop->idle_data = data;
}
-bool event_loop_run(event_loop_t *loop, pthread_mutex_t *mutex) {
- assert(mutex);
+static void check_bad_fds(event_loop_t *loop, meshlink_handle_t *mesh) {
+ // Just call all registered callbacks and have them check their fds
+
+ do {
+ loop->deletion = false;
+
+ for splay_each(io_t, io, &loop->ios) {
+ if(io->flags & IO_WRITE) {
+ io->cb(loop, io->data, IO_WRITE);
+ }
+
+ if(loop->deletion) {
+ break;
+ }
+
+ if(io->flags & IO_READ) {
+ io->cb(loop, io->data, IO_READ);
+ }
+
+ if(loop->deletion) {
+ break;
+ }
+ }
+ } while(loop->deletion);
+
+ // Rebuild the fdsets
+
+ fd_set old_readfds;
+ fd_set old_writefds;
+ memcpy(&old_readfds, &loop->readfds, sizeof(old_readfds));
+ memcpy(&old_writefds, &loop->writefds, sizeof(old_writefds));
+
+ memset(&loop->readfds, 0, sizeof(loop->readfds));
+ memset(&loop->writefds, 0, sizeof(loop->writefds));
+
+ for splay_each(io_t, io, &loop->ios) {
+ if(io->flags & IO_READ) {
+ FD_SET(io->fd, &loop->readfds);
+ io->cb(loop, io->data, IO_READ);
+ }
+
+ if(io->flags & IO_WRITE) {
+ FD_SET(io->fd, &loop->writefds);
+ io->cb(loop, io->data, IO_WRITE);
+ }
+ }
+
+ if(memcmp(&old_readfds, &loop->readfds, sizeof(old_readfds))) {
+ logger(mesh, MESHLINK_WARNING, "Incorrect readfds fixed");
+ }
+
+ if(memcmp(&old_writefds, &loop->writefds, sizeof(old_writefds))) {
+ logger(mesh, MESHLINK_WARNING, "Incorrect writefds fixed");
+ }
+}
+
+bool event_loop_run(event_loop_t *loop, meshlink_handle_t *mesh) {
+ assert(mesh);
fd_set readable;
fd_set writable;
+ int errors = 0;
while(loop->running) {
- gettimeofday(&loop->now, NULL);
- struct timeval diff, it, *tv = NULL;
+ clock_gettime(EVENT_CLOCK, &loop->now);
+ struct timespec it, ts = {3600, 0};
while(loop->timeouts.head) {
timeout_t *timeout = loop->timeouts.head->data;
- timersub(&timeout->tv, &loop->now, &diff);
- if(diff.tv_sec < 0) {
+ if(timespec_lt(&timeout->tv, &loop->now)) {
timeout_disable(loop, timeout);
timeout->cb(loop, timeout->data);
} else {
- tv = &diff;
+ timespec_sub(&timeout->tv, &loop->now, &ts);
break;
}
}
if(loop->idle_cb) {
it = loop->idle_cb(loop, loop->idle_data);
- if(it.tv_sec >= 0 && (!tv || timercmp(&it, tv, <))) {
- tv = ⁢
+ if(it.tv_sec >= 0 && timespec_lt(&it, &ts)) {
+ ts = it;
}
}
}
// release mesh mutex during select
- pthread_mutex_unlock(mutex);
+ pthread_mutex_unlock(&mesh->mutex);
- int n = select(fds, &readable, &writable, NULL, tv);
+#ifdef HAVE_PSELECT
+ int n = pselect(fds, &readable, &writable, NULL, &ts, NULL);
+#else
+ struct timeval tv = {ts.tv_sec, ts.tv_nsec / 1000};
+ int n = select(fds, &readable, &writable, NULL, (struct timeval *)&tv);
+#endif
- pthread_mutex_lock(mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
- gettimeofday(&loop->now, NULL);
+ clock_gettime(EVENT_CLOCK, &loop->now);
if(n < 0) {
if(sockwouldblock(errno)) {
continue;
} else {
- return false;
+ errors++;
+
+ if(errors > 10) {
+ logger(mesh, MESHLINK_ERROR, "Unrecoverable error from select(): %s", strerror(errno));
+ return false;
+ }
+
+ logger(mesh, MESHLINK_WARNING, "Error from select(), checking for bad fds: %s", strerror(errno));
+ check_bad_fds(loop, mesh);
+ continue;
}
}
+ errors = 0;
+
if(!n) {
continue;
}
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;
}
loop->signals.compare = (splay_compare_t)signal_compare;
loop->pipefd[0] = -1;
loop->pipefd[1] = -1;
- gettimeofday(&loop->now, NULL);
+ clock_gettime(EVENT_CLOCK, &loop->now);
}
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);
}
}
projects / meshlink / blobdiff