interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix default_eventloop_run OR instead of AND and hash table iteration safety

This commit is contained in:
Neil Cook 2016-12-15 13:40:40 +00:00
parent efb50939bc
commit 5e26137eda
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/extension/default_eventloop.c
View File

@ -46,14 +46,14 @@ _getdns_eventloop_info *find_event(_getdns_eventloop_info** events, int id)
void add_event(_getdns_eventloop_info** events, int id, _getdns_eventloop_info* ev) void add_event(_getdns_eventloop_info** events, int id, _getdns_eventloop_info* ev)
{ {
DEBUG_SCHED("default_eventloop: add_event with id %d", id); DEBUG_SCHED("default_eventloop: add_event with id %d\n", id);
ev->id = id; ev->id = id;
HASH_ADD_INT(*events, id, ev); HASH_ADD_INT(*events, id, ev);
} }
void delete_event(_getdns_eventloop_info** events, _getdns_eventloop_info* ev) void delete_event(_getdns_eventloop_info** events, _getdns_eventloop_info* ev)
{ {
DEBUG_SCHED("default_eventloop: delete_event with id %d", ev->id); DEBUG_SCHED("default_eventloop: delete_event with id %d\n", ev->id);
HASH_DEL(*events, ev); HASH_DEL(*events, ev);
} }
@ -121,7 +121,7 @@ default_eventloop_schedule(getdns_eventloop *loop,
add_event(&default_loop->fd_events, fd, fd_event); add_event(&default_loop->fd_events, fd, fd_event);
event->ev = (void *) (intptr_t) (fd + 1); event->ev = (void *) (intptr_t) (fd + 1);
DEBUG_SCHED( "scheduled read/write at %d\n", fd); DEBUG_SCHED( "scheduled read/write at fd %d\n", fd);
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
if (!event->timeout_cb) { if (!event->timeout_cb) {
@ -145,7 +145,7 @@ default_eventloop_schedule(getdns_eventloop *loop,
add_event(&default_loop->timeout_events, i, timeout_event); add_event(&default_loop->timeout_events, i, timeout_event);
event->ev = (void *) (intptr_t) (i + 1); event->ev = (void *) (intptr_t) (i + 1);
DEBUG_SCHED( "scheduled timeout at %d\n", (int)i); DEBUG_SCHED( "scheduled timeout at slot %d\n", (int)i);
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
} }
@ -318,18 +318,37 @@ default_eventloop_run_once(getdns_eventloop *loop, int blocking)
} }
if (pfds) if (pfds)
free(pfds); free(pfds);
_getdns_eventloop_info* fd_timeout_cbs = NULL;
HASH_ITER(hh, default_loop->fd_events, s, tmp) { HASH_ITER(hh, default_loop->fd_events, s, tmp) {
if (s->event && if (s->event &&
s->event->timeout_cb && s->event->timeout_cb &&
now > s->timeout_time) now > s->timeout_time)
default_timeout_cb(s->id, s->event); add_event(&fd_timeout_cbs, s->id, s);
} }
/* this is in case the timeout callback deletes the event
and thus messes with the iteration */
HASH_ITER(hh, fd_timeout_cbs, s, tmp) {
int fd = s->id;
getdns_eventloop_event* event = s->event;
delete_event(&fd_timeout_cbs, s);
default_timeout_cb(fd, event);
}
_getdns_eventloop_info* timeout_timeout_cbs = NULL;
HASH_ITER(hh, default_loop->timeout_events, s, tmp) { HASH_ITER(hh, default_loop->timeout_events, s, tmp) {
if (s->event && if (s->event &&
s->event->timeout_cb && s->event->timeout_cb &&
now > s->timeout_time) now > s->timeout_time)
default_timeout_cb(s->id, s->event); add_event(&timeout_timeout_cbs, s->id, s);
} }
/* this is in case the timeout callback deletes the event
and thus messes with the iteration */
HASH_ITER(hh, timeout_timeout_cbs, s, tmp) {
int fd = s->id;
getdns_eventloop_event* event = s->event;
delete_event(&timeout_timeout_cbs, s);
default_timeout_cb(fd, event);
}
} }
static void static void
@ -341,7 +360,7 @@ default_eventloop_run(getdns_eventloop *loop)
return; return;
/* keep going until all the events are cleared */ /* keep going until all the events are cleared */
while (default_loop->fd_events && default_loop->timeout_events) { while (default_loop->fd_events || default_loop->timeout_events) {
default_eventloop_run_once(loop, 1); default_eventloop_run_once(loop, 1);
} }
} }