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;
}
static splay_tree_t timeout_tree = {.compare = (splay_compare_t)timeout_compare};
void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags) {
- if(io->cb)
+ if(io->cb) {
return;
+ }
io->fd = fd;
#ifdef HAVE_MINGW
- if (io->fd != -1) {
+
+ if(io->fd != -1) {
io->event = WSACreateEvent();
- if (io->event == WSA_INVALID_EVENT)
+
+ if(io->event == WSA_INVALID_EVENT) {
abort();
+ }
}
+
event_count++;
#endif
io->cb = cb;
io_set(io, flags);
- if(!splay_insert_node(&io_tree, &io->node))
+ if(!splay_insert_node(&io_tree, &io->node)) {
abort();
+ }
}
#ifdef HAVE_MINGW
#endif
void io_set(io_t *io, int flags) {
- if (flags == io->flags)
+ if(flags == io->flags) {
return;
+ }
+
io->flags = flags;
- if (io->fd == -1)
+
+ if(io->fd == -1) {
return;
+ }
#ifndef HAVE_MINGW
- if(flags & IO_READ)
+
+ if(flags & IO_READ) {
FD_SET(io->fd, &readfds);
- else
+ } else {
FD_CLR(io->fd, &readfds);
+ }
- if(flags & IO_WRITE)
+ if(flags & IO_WRITE) {
FD_SET(io->fd, &writefds);
- else
+ } else {
FD_CLR(io->fd, &writefds);
+ }
+
#else
long events = 0;
- if (flags & IO_WRITE)
+
+ if(flags & IO_WRITE) {
events |= WRITE_EVENTS;
- if (flags & IO_READ)
+ }
+
+ if(flags & IO_READ) {
events |= READ_EVENTS;
- if (WSAEventSelect(io->fd, io->event, events) != 0)
+ }
+
+ if(WSAEventSelect(io->fd, io->event, events) != 0) {
abort();
+ }
+
#endif
}
void io_del(io_t *io) {
- if(!io->cb)
+ if(!io->cb) {
return;
+ }
io_set(io, 0);
#ifdef HAVE_MINGW
- if (io->fd != -1 && WSACloseEvent(io->event) == FALSE)
+
+ if(io->fd != -1 && WSACloseEvent(io->event) == FALSE) {
abort();
+ }
+
event_count--;
#endif
}
void timeout_set(timeout_t *timeout, struct timeval *tv) {
- if(timerisset(&timeout->tv))
+ if(timerisset(&timeout->tv)) {
splay_unlink_node(&timeout_tree, &timeout->node);
+ }
- if(!now.tv_sec)
+ if(!now.tv_sec) {
gettimeofday(&now, NULL);
+ }
timeradd(&now, tv, &timeout->tv);
- if(!splay_insert_node(&timeout_tree, &timeout->node))
+ if(!splay_insert_node(&timeout_tree, &timeout->node)) {
abort();
+ }
}
void timeout_del(timeout_t *timeout) {
- if(!timeout->cb)
+ if(!timeout->cb) {
return;
+ }
splay_unlink_node(&timeout_tree, &timeout->node);
timeout->cb = 0;
- timeout->tv = (struct timeval){0, 0};
+ timeout->tv = (struct timeval) {
+ 0, 0
+ };
}
#ifndef HAVE_MINGW
static void signalio_handler(void *data, int flags) {
unsigned char signum;
- if(read(pipefd[0], &signum, 1) != 1)
+
+ if(read(pipefd[0], &signum, 1) != 1) {
return;
+ }
- signal_t *sig = splay_search(&signal_tree, &((signal_t){.signum = signum}));
- if(sig)
+ signal_t *sig = splay_search(&signal_tree, &((signal_t) {
+ .signum = signum
+ }));
+
+ if(sig) {
sig->cb(sig->data);
+ }
}
static void pipe_init(void) {
- if(!pipe(pipefd))
+ if(!pipe(pipefd)) {
io_add(&signalio, signalio_handler, NULL, pipefd[0], IO_READ);
+ }
}
void signal_add(signal_t *sig, signal_cb_t cb, void *data, int signum) {
- if(sig->cb)
+ if(sig->cb) {
return;
+ }
sig->cb = cb;
sig->data = data;
sig->signum = signum;
sig->node.data = sig;
- if(pipefd[0] == -1)
+ if(pipefd[0] == -1) {
pipe_init();
+ }
signal(sig->signum, signal_handler);
- if(!splay_insert_node(&signal_tree, &sig->node))
+ if(!splay_insert_node(&signal_tree, &sig->node)) {
abort();
+ }
}
void signal_del(signal_t *sig) {
- if(!sig->cb)
+ if(!sig->cb) {
return;
+ }
signal(sig->signum, SIG_DFL);
}
#endif
-static struct timeval * get_time_remaining(struct timeval *diff) {
+static struct timeval *get_time_remaining(struct timeval *diff) {
gettimeofday(&now, NULL);
struct timeval *tv = NULL;
if(diff->tv_sec < 0) {
timeout->cb(timeout->data);
- if(timercmp(&timeout->tv, &now, <))
+
+ if(timercmp(&timeout->tv, &now, <)) {
timeout_del(timeout);
+ }
} else {
tv = diff;
break;
int n = select(fds, &readable, &writable, NULL, tv);
if(n < 0) {
- if(sockwouldblock(sockerrno))
+ if(sockwouldblock(sockerrno)) {
continue;
- else
+ } else {
return false;
+ }
}
- if(!n)
+ if(!n) {
continue;
+ }
for splay_each(io_t, io, &io_tree) {
- if(FD_ISSET(io->fd, &writable))
+ if(FD_ISSET(io->fd, &writable)) {
io->cb(io->data, IO_WRITE);
- else if(FD_ISSET(io->fd, &readable))
+ } else if(FD_ISSET(io->fd, &readable)) {
io->cb(io->data, IO_READ);
- else
+ } else {
continue;
+ }
/*
There are scenarios in which the callback will remove another io_t from the tree
break;
}
}
+
#else
- while (running) {
+
+ while(running) {
struct timeval diff;
struct timeval *tv = get_time_remaining(&diff);
DWORD timeout_ms = tv ? (tv->tv_sec * 1000 + tv->tv_usec / 1000 + 1) : WSA_INFINITE;
- if (!event_count) {
+ if(!event_count) {
Sleep(timeout_ms);
continue;
}
Note that technically FD_CLOSE has the same problem, but it's okay because user code does not rely on
this event being fired again if ignored.
*/
- io_t* writeable_io = NULL;
+ io_t *writeable_io = NULL;
+
for splay_each(io_t, io, &io_tree)
- if (io->flags & IO_WRITE && send(io->fd, NULL, 0, 0) == 0) {
+ if(io->flags & IO_WRITE && send(io->fd, NULL, 0, 0) == 0) {
writeable_io = io;
break;
}
- if (writeable_io) {
+
+ if(writeable_io) {
writeable_io->cb(writeable_io->data, IO_WRITE);
continue;
}
- WSAEVENT* events = xmalloc(event_count * sizeof(*events));
+ WSAEVENT *events = xmalloc(event_count * sizeof(*events));
DWORD event_index = 0;
+
for splay_each(io_t, io, &io_tree) {
events[event_index] = io->event;
event_index++;
DWORD result = WSAWaitForMultipleEvents(event_count, events, FALSE, timeout_ms, FALSE);
WSAEVENT event;
- if (result >= WSA_WAIT_EVENT_0 && result < WSA_WAIT_EVENT_0 + event_count)
+
+ if(result >= WSA_WAIT_EVENT_0 && result < WSA_WAIT_EVENT_0 + event_count) {
event = events[result - WSA_WAIT_EVENT_0];
+ }
+
free(events);
- if (result == WSA_WAIT_TIMEOUT)
+
+ if(result == WSA_WAIT_TIMEOUT) {
continue;
- if (result < WSA_WAIT_EVENT_0 || result >= WSA_WAIT_EVENT_0 + event_count)
+ }
+
+ if(result < WSA_WAIT_EVENT_0 || result >= WSA_WAIT_EVENT_0 + event_count) {
return false;
+ }
+
+ io_t *io = splay_search(&io_tree, &((io_t) {
+ .event = event
+ }));
- io_t *io = splay_search(&io_tree, &((io_t){.event = event}));
- if (!io)
+ if(!io) {
abort();
+ }
- if (io->fd == -1) {
+ if(io->fd == -1) {
io->cb(io->data, 0);
} else {
WSANETWORKEVENTS network_events;
- if (WSAEnumNetworkEvents(io->fd, io->event, &network_events) != 0)
+
+ if(WSAEnumNetworkEvents(io->fd, io->event, &network_events) != 0) {
return false;
- if (network_events.lNetworkEvents & READ_EVENTS)
+ }
+
+ if(network_events.lNetworkEvents & READ_EVENTS) {
io->cb(io->data, IO_READ);
+ }
+
/*
The fd might be available for write too. However, if we already fired the read callback, that
callback might have deleted the io (e.g. through terminate_connection()), so we can't fire the
*/
}
}
+
#endif
return true;
projects / tinc / blobdiff