misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wakeup into the main thread to remove complexity. Looks like CLOCK_MONOTONIC_COARSE doesn't need a syscall.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-22 14:37:00 -08:00
parent 70cfaa94aa
commit f255170967
5 changed files with 53 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adsbus/common.c
View File

@@ -12,7 +12,7 @@
#include <uuid/uuid.h>
#include "common.h"
#include "wakeup.h"
static char server_id[UUID_LEN];
static int peer_epoll_fd;
@@ -68,16 +68,18 @@ void peer_loop() {
while (!peer_canceled) {
#define MAX_EVENTS 10
struct epoll_event events[MAX_EVENTS];
int nfds = epoll_wait(peer_epoll_fd, events, MAX_EVENTS, -1);
int nfds = epoll_wait(peer_epoll_fd, events, MAX_EVENTS, wakeup_get_delay());
if (nfds == -1 && errno == EINTR) {
continue;
}
assert(nfds > 0);
assert(nfds >= 0);
for (int n = 0; n < nfds; n++) {
struct peer *peer = events[n].data.ptr;
peer->event_handler(peer);
}
wakeup_dispatch();
}
assert(!close(peer_epoll_fd));
}