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

Remove redundant param from schedule_timeout funcs

This commit is contained in:
Willem Toorop 2014-10-06 20:23:50 +02:00
parent 648153f98c
commit 58b3e553de
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/context.c
View File

@ -2027,7 +2027,7 @@ getdns_context_schedule_timeout(struct getdns_context* context,
if (context->extension) { if (context->extension) {
result = context->extension->schedule_timeout(context, context->extension_data, result = context->extension->schedule_timeout(context, context->extension_data,
timeout, timeout_data, &(timeout_data->extension_timer)); timeout, timeout_data);
} else { } else {
result = GETDNS_RETURN_GENERIC_ERROR; result = GETDNS_RETURN_GENERIC_ERROR;
if (gettimeofday(&timeout_data->timeout_time, NULL) == 0) { if (gettimeofday(&timeout_data->timeout_time, NULL) == 0) {

7
src/extension/libev.c
View File

@ -102,9 +102,8 @@ getdns_libev_cleanup(struct getdns_context* context, void* data) {
static getdns_return_t static getdns_return_t
getdns_libev_schedule_timeout(struct getdns_context* context, getdns_libev_schedule_timeout(struct getdns_context* context,
void* eventloop_data, uint64_t timeout, void* eventloop_data, uint64_t timeout,
getdns_timeout_data_t* timeout_data, getdns_timeout_data_t* timeout_data)
void** eventloop_timer) { {
struct ev_timer *timer; struct ev_timer *timer;
struct getdns_libev_data* ev_data = (struct getdns_libev_data*) eventloop_data; struct getdns_libev_data* ev_data = (struct getdns_libev_data*) eventloop_data;
ev_tstamp to = timeout; ev_tstamp to = timeout;
@ -112,9 +111,9 @@ getdns_libev_schedule_timeout(struct getdns_context* context,
timer = (struct ev_timer*) malloc(sizeof(struct ev_timer)); timer = (struct ev_timer*) malloc(sizeof(struct ev_timer));
ev_timer_init(timer, getdns_libev_timeout_cb, to, 0); ev_timer_init(timer, getdns_libev_timeout_cb, to, 0);
timer->data = timeout_data; timer->data = timeout_data;
timeout_data->extension_timer = timer;
ev_timer_start(ev_data->loop, timer); ev_timer_start(ev_data->loop, timer);
*eventloop_timer = timer;
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }

7
src/extension/libevent.c
View File

@ -122,9 +122,8 @@ getdns_libevent_cleanup(struct getdns_context* context, void* data) {
static getdns_return_t static getdns_return_t
getdns_libevent_schedule_timeout(struct getdns_context* context, getdns_libevent_schedule_timeout(struct getdns_context* context,
void* eventloop_data, uint64_t timeout, void* eventloop_data, uint64_t timeout,
getdns_timeout_data_t* timeout_data, getdns_timeout_data_t* timeout_data)
void** eventloop_timer) { {
struct timeval tv; struct timeval tv;
struct event* ev = NULL; struct event* ev = NULL;
struct event_data* ev_data = (struct event_data*) eventloop_data; struct event_data* ev_data = (struct event_data*) eventloop_data;
@ -133,9 +132,9 @@ getdns_libevent_schedule_timeout(struct getdns_context* context,
tv.tv_usec = (timeout % 1000) * 1000; tv.tv_usec = (timeout % 1000) * 1000;
ev = evtimer_new(ev_data->event_base, getdns_libevent_timeout_cb, timeout_data); ev = evtimer_new(ev_data->event_base, getdns_libevent_timeout_cb, timeout_data);
timeout_data->extension_timer = ev;
evtimer_add(ev, &tv); evtimer_add(ev, &tv);
*eventloop_timer = ev;
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }

7
src/extension/libuv.c
View File

@ -104,18 +104,17 @@ getdns_libuv_cleanup(struct getdns_context* context, void* data) {
static getdns_return_t static getdns_return_t
getdns_libuv_schedule_timeout(struct getdns_context* context, getdns_libuv_schedule_timeout(struct getdns_context* context,
void* eventloop_data, uint64_t timeout, void* eventloop_data, uint64_t timeout,
getdns_timeout_data_t* timeout_data, getdns_timeout_data_t* timeout_data)
void** eventloop_timer) { {
uv_timer_t *timer; uv_timer_t *timer;
struct getdns_libuv_data* uv_data = (struct getdns_libuv_data*) eventloop_data; struct getdns_libuv_data* uv_data = (struct getdns_libuv_data*) eventloop_data;
timer = (uv_timer_t*) malloc(sizeof(uv_timer_t)); timer = (uv_timer_t*) malloc(sizeof(uv_timer_t));
timer->data = timeout_data; timer->data = timeout_data;
timeout_data->extension_timer = timer;
uv_timer_init(uv_data->loop, timer); uv_timer_init(uv_data->loop, timer);
uv_timer_start(timer, getdns_libuv_timeout_cb, timeout, 0); uv_timer_start(timer, getdns_libuv_timeout_cb, timeout, 0);
*eventloop_timer = timer;
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }

3
src/getdns/getdns_extra.h
View File

@ -89,8 +89,7 @@ typedef getdns_return_t (*getdns_eventloop_cleanup_t)(struct getdns_context* con
stored in eventloop_timer */ stored in eventloop_timer */
typedef getdns_return_t (*getdns_eventloop_schedule_timeout_t)(struct getdns_context* context, typedef getdns_return_t (*getdns_eventloop_schedule_timeout_t)(struct getdns_context* context,
void* eventloop_data, uint64_t timeout, void* eventloop_data, uint64_t timeout,
getdns_timeout_data_t* timeout_data, getdns_timeout_data_t* timeout_data);
void** eventloop_timer);
/* call the extension to free a timer. The timer passed in is the same as that returned in /* call the extension to free a timer. The timer passed in is the same as that returned in
the schedule timeout */ the schedule timeout */