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

Merge pull request #476 from elindsey/develop 

register only a single poll_t with libuv
This commit is contained in:
Willem Toorop 2020-06-19 10:24:17 +02:00 committed by GitHub
parent f020cca206 2673a5736c
commit 7c767b1a5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/extension/libuv.c
View File

@ -73,8 +73,7 @@ getdns_libuv_cleanup(getdns_eventloop *loop)
} }
typedef struct poll_timer { typedef struct poll_timer {
uv_poll_t read; uv_poll_t poll;
uv_poll_t write;
uv_timer_t timer; uv_timer_t timer;
int to_close; int to_close;
struct mem_funcs mf; struct mem_funcs mf;
@ -111,15 +110,8 @@ getdns_libuv_clear(getdns_eventloop *loop, getdns_eventloop_event *el_ev)
DEBUG_UV("enter libuv_clear(el_ev = %p, my_ev = %p, to_close = %d)\n" DEBUG_UV("enter libuv_clear(el_ev = %p, my_ev = %p, to_close = %d)\n"
, el_ev, my_ev, my_ev->to_close); , el_ev, my_ev, my_ev->to_close);
if (el_ev->read_cb) { if (el_ev->read_cb || el_ev->write_cb) {
my_poll = &my_ev->read; my_poll = &my_ev->poll;
uv_poll_stop(my_poll);
my_ev->to_close += 1;
my_poll->data = my_ev;
uv_close((uv_handle_t *)my_poll, getdns_libuv_close_cb);
}
if (el_ev->write_cb) {
my_poll = &my_ev->write;
uv_poll_stop(my_poll); uv_poll_stop(my_poll);
my_ev->to_close += 1; my_ev->to_close += 1;
my_poll->data = my_ev; my_poll->data = my_ev;
@ -139,29 +131,28 @@ getdns_libuv_clear(getdns_eventloop *loop, getdns_eventloop_event *el_ev)
} }
static void static void
getdns_libuv_read_cb(uv_poll_t *poll, int status, int events) getdns_libuv_cb(uv_poll_t *poll, int status, int events)
{ {
getdns_eventloop_event *el_ev = (getdns_eventloop_event *)poll->data; getdns_eventloop_event *el_ev = (getdns_eventloop_event *)poll->data;
(void)status; (void)events; (void)status;
assert(el_ev->read_cb);
DEBUG_UV("enter libuv_read_cb(el_ev = %p, el_ev->ev = %p)\n"
, el_ev, el_ev->ev);
el_ev->read_cb(el_ev->userarg);
DEBUG_UV("exit libuv_read_cb(el_ev = %p, el_ev->ev = %p)\n"
, el_ev, el_ev->ev);
}
static void if (events & UV_READABLE) {
getdns_libuv_write_cb(uv_poll_t *poll, int status, int events) assert(el_ev->read_cb);
{ DEBUG_UV("enter libuv_read_cb(el_ev = %p, el_ev->ev = %p)\n"
getdns_eventloop_event *el_ev = (getdns_eventloop_event *)poll->data; , el_ev, el_ev->ev);
(void)status; (void)events; el_ev->read_cb(el_ev->userarg);
assert(el_ev->write_cb); DEBUG_UV("exit libuv_read_cb(el_ev = %p, el_ev->ev = %p)\n"
DEBUG_UV("enter libuv_write_cb(el_ev = %p, el_ev->ev = %p)\n" , el_ev, el_ev->ev);
, el_ev, el_ev->ev); } else if (events & UV_WRITABLE) {
el_ev->write_cb(el_ev->userarg); assert(el_ev->write_cb);
DEBUG_UV("exit libuv_write_cb(el_ev = %p, el_ev->ev = %p)\n" DEBUG_UV("enter libuv_write_cb(el_ev = %p, el_ev->ev = %p)\n"
, el_ev, el_ev->ev); , el_ev, el_ev->ev);
el_ev->write_cb(el_ev->userarg);
DEBUG_UV("exit libuv_write_cb(el_ev = %p, el_ev->ev = %p)\n"
, el_ev, el_ev->ev);
} else {
assert(ASSERT_UNREACHABLE);
}
} }
static void static void
@ -206,17 +197,14 @@ getdns_libuv_schedule(getdns_eventloop *loop,
my_ev->mf = ext->mf; my_ev->mf = ext->mf;
el_ev->ev = my_ev; el_ev->ev = my_ev;
if (el_ev->read_cb) { if (el_ev->read_cb || el_ev->write_cb) {
my_poll = &my_ev->read; my_poll = &my_ev->poll;
my_poll->data = el_ev; my_poll->data = el_ev;
uv_poll_init(ext->loop, my_poll, fd); uv_poll_init(ext->loop, my_poll, fd);
uv_poll_start(my_poll, UV_READABLE, getdns_libuv_read_cb); int events =
} (el_ev->read_cb ? UV_READABLE : 0) |
if (el_ev->write_cb) { (el_ev->write_cb ? UV_WRITABLE : 0);
my_poll = &my_ev->write; uv_poll_start(my_poll, events, getdns_libuv_cb);
my_poll->data = el_ev;
uv_poll_init(ext->loop, my_poll, fd);
uv_poll_start(my_poll, UV_WRITABLE, getdns_libuv_write_cb);
} }
if (el_ev->timeout_cb) { if (el_ev->timeout_cb) {
my_timer = &my_ev->timer; my_timer = &my_ev->timer;