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

Timeout events in array

This commit is contained in:
Willem Toorop 2017-02-16 15:22:57 +01:00
parent e87e907128
commit 2d35993c83
2 changed files with 114 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/extension/poll_eventloop.c
View File

@ -38,6 +38,44 @@
#include "extension/poll_eventloop.h" #include "extension/poll_eventloop.h"
#include "debug.h" #include "debug.h"
enum { init_pfds_capacity = 64
, init_to_events_capacity = 64 };
static void *get_to_event(_getdns_poll_eventloop *loop,
getdns_eventloop_event *event, uint64_t timeout_time)
{
unsigned long i = 0;
while (i < loop->to_events_capacity && loop->to_events[i].event) i++;
if (i == loop->to_events_capacity) {
if (i) {
_getdns_poll_to_event *to_events = GETDNS_XREALLOC(
loop->mf, loop->to_events, _getdns_poll_to_event, i * 2);
if (!to_events)
return NULL;
(void) memset(&loop->to_events[i], 0,
sizeof(_getdns_poll_to_event) * i);
loop->to_events_capacity = i * 2;
loop->to_events = to_events;
} else {
if (!(loop->to_events = GETDNS_XMALLOC(loop->mf,
_getdns_poll_to_event, init_to_events_capacity)))
return NULL;
(void) memset(loop->to_events, 0,
sizeof(_getdns_poll_to_event)
* init_to_events_capacity);
loop->to_events_capacity = init_to_events_capacity;
}
}
loop->to_events[i].event = event;
loop->to_events[i].timeout_time = timeout_time;
return (void *) (intptr_t) (i + 1);
}
static _getdns_eventloop_info * static _getdns_eventloop_info *
find_event(_getdns_eventloop_info** events, int id) find_event(_getdns_eventloop_info** events, int id)
{ {
@ -93,7 +131,6 @@ poll_eventloop_schedule(getdns_eventloop *loop,
{ {
_getdns_poll_eventloop *poll_loop = (_getdns_poll_eventloop *)loop; _getdns_poll_eventloop *poll_loop = (_getdns_poll_eventloop *)loop;
struct mem_funcs *mf = &poll_loop->mf; struct mem_funcs *mf = &poll_loop->mf;
size_t i;
DEBUG_SCHED( "%s(loop: %p, fd: %d, timeout: %"PRIu64", event: %p, max_fds: %d)\n" DEBUG_SCHED( "%s(loop: %p, fd: %d, timeout: %"PRIu64", event: %p, max_fds: %d)\n"
, __FUNC__, (void *)loop, fd, timeout, (void *)event, poll_loop->max_fds); , __FUNC__, (void *)loop, fd, timeout, (void *)event, poll_loop->max_fds);
@ -150,14 +187,10 @@ poll_eventloop_schedule(getdns_eventloop *loop,
DEBUG_SCHED("ERROR: timeout event with write_cb! Clearing.\n"); DEBUG_SCHED("ERROR: timeout event with write_cb! Clearing.\n");
event->write_cb = NULL; event->write_cb = NULL;
} }
for (i = poll_loop->timeout_id + 1; i != poll_loop->timeout_id; i++) { if ((event->ev = get_to_event(poll_loop, event, get_now_plus(timeout)))) {
if (find_event(&poll_loop->timeout_events, i) == NULL) { DEBUG_SCHED("scheduled timeout at slot %p\n", event->ev);
event->ev = add_event(mf, &poll_loop->timeout_events, i, event, get_now_plus(timeout));
DEBUG_SCHED( "scheduled timeout at slot %d\n", (int)i);
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
}
DEBUG_SCHED("ERROR: Out of timeout slots!\n"); DEBUG_SCHED("ERROR: Out of timeout slots!\n");
return GETDNS_RETURN_GENERIC_ERROR; return GETDNS_RETURN_GENERIC_ERROR;
} }
@ -175,12 +208,29 @@ poll_eventloop_clear(getdns_eventloop *loop, getdns_eventloop_event *event)
assert(event->ev); assert(event->ev);
delete_event(mf, if (event->timeout_cb && !event->read_cb && !event->write_cb) {
( event->timeout_cb && !event->read_cb && !event->write_cb unsigned long i = ((unsigned long) (intptr_t) event->ev) - 1;
? &poll_loop->timeout_events : &poll_loop->fd_events
), event->ev);
event->ev = NULL;
/* This may happen with full recursive synchronous requests
* with the unbound pluggable event API, because the default
* poll_eventloop is temporarily replaced by a poll_eventloop
* used only in synchronous calls. When the synchronous request
* had an answer, the poll_eventloop for the synchronous is
* cleaned, however it could still have outstanding events.
*/
if (i >= poll_loop->to_events_capacity ||
poll_loop->to_events[i].event != event) {
event->ev = NULL;
DEBUG_SCHED( "ERROR: Event mismatch %p\n", (void *)event->ev);
return GETDNS_RETURN_GENERIC_ERROR;
}
poll_loop->to_events[i].event = NULL;
DEBUG_SCHED( "cleared timeout at slot %p\n", event->ev);
} else
delete_event(mf, &poll_loop->fd_events, event->ev);
event->ev = NULL;
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
@ -195,8 +245,12 @@ poll_eventloop_cleanup(getdns_eventloop *loop)
poll_loop->pfds = NULL; poll_loop->pfds = NULL;
poll_loop->pfds_capacity = 0; poll_loop->pfds_capacity = 0;
} }
if (poll_loop->to_events) {
GETDNS_FREE(*mf, poll_loop->to_events);
poll_loop->to_events = NULL;
poll_loop->to_events_capacity = 0;
}
HASH_CLEAR(hh, poll_loop->fd_events); HASH_CLEAR(hh, poll_loop->fd_events);
HASH_CLEAR(hh, poll_loop->timeout_events);
} }
static void static void
@ -247,10 +301,9 @@ poll_eventloop_run_once(getdns_eventloop *loop, int blocking)
struct mem_funcs *mf = &poll_loop->mf; struct mem_funcs *mf = &poll_loop->mf;
_getdns_eventloop_info *s, *tmp; _getdns_eventloop_info *s, *tmp;
uint64_t now, timeout = TIMEOUT_FOREVER; uint64_t now, timeout = TIMEOUT_FOREVER;
size_t i=0; size_t i = 0;
int poll_timeout = 0; int poll_timeout = 0;
unsigned int num_pfds = 0; unsigned int num_pfds = 0;
_getdns_eventloop_info* timeout_timeout_cbs = NULL;
_getdns_eventloop_info* fd_timeout_cbs = NULL; _getdns_eventloop_info* fd_timeout_cbs = NULL;
if (!loop) if (!loop)
@ -258,18 +311,15 @@ poll_eventloop_run_once(getdns_eventloop *loop, int blocking)
now = get_now_plus(0); now = get_now_plus(0);
HASH_ITER(hh, poll_loop->timeout_events, s, tmp) { for (i = 0; i < poll_loop->to_events_capacity; i++) {
if (now > s->timeout_time) if (poll_loop->to_events[i].event &&
(void) add_event(mf, &timeout_timeout_cbs, s->id, s->event, s->timeout_time); poll_loop->to_events[i].timeout_time < now)
else if (s->timeout_time < timeout) poll_timeout_cb(-1, poll_loop->to_events[i].event);
timeout = s->timeout_time;
} }
/* this is in case the timeout callback deletes the event for (i = 0; i < poll_loop->to_events_capacity; i++) {
and thus messes with the iteration */ if (poll_loop->to_events[i].event &&
HASH_ITER(hh, timeout_timeout_cbs, s, tmp) { poll_loop->to_events[i].timeout_time < timeout)
getdns_eventloop_event* event = s->event; timeout = poll_loop->to_events[i].timeout_time;
delete_event(mf, &timeout_timeout_cbs, s);
poll_timeout_cb(-1, event);
} }
/* first we count the number of fds that will be active */ /* first we count the number of fds that will be active */
HASH_ITER(hh, poll_loop->fd_events, s, tmp) { HASH_ITER(hh, poll_loop->fd_events, s, tmp) {
@ -354,20 +404,22 @@ poll_eventloop_run_once(getdns_eventloop *loop, int blocking)
delete_event(mf, &fd_timeout_cbs, s); delete_event(mf, &fd_timeout_cbs, s);
poll_timeout_cb(fd, event); poll_timeout_cb(fd, event);
} }
HASH_ITER(hh, poll_loop->timeout_events, s, tmp) { for (i = 0; i < poll_loop->to_events_capacity; i++) {
if (s->event && if (poll_loop->to_events[i].event &&
s->event->timeout_cb && poll_loop->to_events[i].timeout_time < now)
now > s->timeout_time) poll_timeout_cb(-1, poll_loop->to_events[i].event);
(void) add_event(mf, &timeout_timeout_cbs, s->id, s->event, s->timeout_time);
}
/* this is in case the timeout callback deletes the event
and thus messes with the iteration */
HASH_ITER(hh, timeout_timeout_cbs, s, tmp) {
getdns_eventloop_event* event = s->event;
delete_event(mf, &timeout_timeout_cbs, s);
poll_timeout_cb(-1, event);
} }
}
static unsigned long to_events_used(_getdns_poll_eventloop *loop)
{
unsigned int i, count = 0;
for (i = 0; i < loop->to_events_capacity; i++) {
if (loop->to_events[i].event)
count++;
}
return count;
} }
static void static void
@ -379,7 +431,7 @@ poll_eventloop_run(getdns_eventloop *loop)
return; return;
/* keep going until all the events are cleared */ /* keep going until all the events are cleared */
while (poll_loop->fd_events || poll_loop->timeout_events) { while (poll_loop->fd_events || to_events_used(poll_loop)) {
poll_eventloop_run_once(loop, 1); poll_eventloop_run_once(loop, 1);
} }
} }
@ -411,9 +463,19 @@ _getdns_poll_eventloop_init(struct mem_funcs *mf, _getdns_poll_eventloop *loop)
#if HAVE_GETRLIMIT #if HAVE_GETRLIMIT
} }
#endif #endif
loop->timeout_id = 0; loop->pfds_capacity = init_pfds_capacity;
loop->pfds = NULL; if (!(loop->pfds = GETDNS_XMALLOC(
*mf, struct pollfd, init_pfds_capacity)))
loop->pfds_capacity = 0; loop->pfds_capacity = 0;
loop->fd_events = NULL; loop->fd_events = NULL;
loop->timeout_events = NULL; loop->to_events_capacity = init_to_events_capacity;
if ((loop->to_events = GETDNS_XMALLOC(
*mf, _getdns_poll_to_event, init_to_events_capacity)))
(void) memset(loop->to_events, 0,
sizeof(_getdns_poll_to_event) * init_to_events_capacity);
else
loop->to_events_capacity = 0;
} }

11
src/extension/poll_eventloop.h
View File

@ -49,15 +49,20 @@ typedef struct _getdns_eventloop_info {
UT_hash_handle hh; UT_hash_handle hh;
} _getdns_eventloop_info; } _getdns_eventloop_info;
typedef struct _getdns_poll_to_event {
getdns_eventloop_event *event;
uint64_t timeout_time;
} _getdns_poll_to_event;
typedef struct _getdns_poll_eventloop { typedef struct _getdns_poll_eventloop {
getdns_eventloop loop; getdns_eventloop loop;
struct mem_funcs mf; struct mem_funcs mf;
unsigned int max_fds; unsigned int max_fds;
unsigned int timeout_id;
struct pollfd *pfds;
unsigned long pfds_capacity; unsigned long pfds_capacity;
struct pollfd *pfds;
_getdns_eventloop_info *fd_events; _getdns_eventloop_info *fd_events;
_getdns_eventloop_info *timeout_events; unsigned long to_events_capacity;
_getdns_poll_to_event *to_events;
} _getdns_poll_eventloop; } _getdns_poll_eventloop;
void void