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

First round of bugfixes in custom eventloop

This commit is contained in:
Willem Toorop 2015-08-26 16:13:25 +02:00
parent c86df63b7a
commit 4ecf6b23dc
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/test/getdns_query.c
View File

@ -29,7 +29,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dirent.h>
#include <inttypes.h> #include <inttypes.h>
#include <getdns/getdns.h> #include <getdns/getdns.h>
#include <getdns/getdns_extra.h> #include <getdns/getdns_extra.h>
@ -56,7 +55,7 @@ static uint64_t get_now_plus(uint64_t amount)
} }
now = tv.tv_sec * 1000000 + tv.tv_usec; now = tv.tv_sec * 1000000 + tv.tv_usec;
return (now + amount) > now ? now + amount : -1; return (now + amount * 1000) >= now ? now + amount * 1000 : -1;
} }
getdns_return_t getdns_return_t
@ -70,7 +69,7 @@ my_eventloop_schedule(getdns_eventloop *loop,
assert(event); assert(event);
assert(fd < FD_SETSIZE); assert(fd < FD_SETSIZE);
if (fd >= 0) { if (fd >= 0 && (event->read_cb || event->write_cb)) {
assert(event->read_cb || event->write_cb); assert(event->read_cb || event->write_cb);
assert(my_loop->fd_events[fd] == NULL); assert(my_loop->fd_events[fd] == NULL);
@ -110,6 +109,7 @@ my_eventloop_clear(getdns_eventloop *loop, getdns_eventloop_event *event)
assert(my_loop->fd_events[(intptr_t)event->ev] == event); assert(my_loop->fd_events[(intptr_t)event->ev] == event);
my_loop->fd_events[(intptr_t)event->ev] = NULL; my_loop->fd_events[(intptr_t)event->ev] = NULL;
} }
event->ev = NULL;
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
@ -117,6 +117,22 @@ void my_eventloop_cleanup(getdns_eventloop *loop)
{ {
} }
void my_read_cb(int fd, getdns_eventloop_event *event)
{
event->read_cb(event->userarg);
}
void my_write_cb(int fd, getdns_eventloop_event *event)
{
event->write_cb(event->userarg);
}
void my_timeout_cb(uint64_t now, uint64_t timeout,
int fd, getdns_eventloop_event *event)
{
event->timeout_cb(event->userarg);
}
void my_eventloop_run_once(getdns_eventloop *loop, int blocking) void my_eventloop_run_once(getdns_eventloop *loop, int blocking)
{ {
my_eventloop *my_loop = (my_eventloop *)loop; my_eventloop *my_loop = (my_eventloop *)loop;
@ -134,10 +150,10 @@ void my_eventloop_run_once(getdns_eventloop *loop, int blocking)
now = get_now_plus(0); now = get_now_plus(0);
for (i = 0; i < MAX_TIMEOUTS; i++) { for (i = 0; i < MAX_TIMEOUTS; i++) {
if (my_loop->timeout_events[i] && if (!my_loop->timeout_events[i])
now > my_loop->timeout_times[i]) continue;
my_loop->timeout_events[i]->timeout_cb( if (now > my_loop->timeout_times[i])
my_loop->timeout_events[i]->userarg); my_timeout_cb(now, my_loop->timeout_times[i], -1, my_loop->timeout_events[i]);
else if (my_loop->timeout_times[i] < timeout) else if (my_loop->timeout_times[i] < timeout)
timeout = my_loop->timeout_times[i]; timeout = my_loop->timeout_times[i];
} }
@ -160,10 +176,10 @@ void my_eventloop_run_once(getdns_eventloop *loop, int blocking)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 0; tv.tv_usec = 0;
} else { } else {
tv.tv_sec = timeout / 1000000; tv.tv_sec = (timeout - now) / 1000000;
tv.tv_usec = timeout % 1000000; tv.tv_usec = (timeout - now) % 1000000;
} }
if (select(max_fd + 1, &readfds, &writefds, NULL, &tv)) { if (select(max_fd + 1, &readfds, &writefds, NULL, &tv) < 0) {
perror("select() failed"); perror("select() failed");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -172,27 +188,23 @@ void my_eventloop_run_once(getdns_eventloop *loop, int blocking)
if (my_loop->fd_events[fd] && if (my_loop->fd_events[fd] &&
my_loop->fd_events[fd]->read_cb && my_loop->fd_events[fd]->read_cb &&
FD_ISSET(fd, &readfds)) FD_ISSET(fd, &readfds))
my_loop->fd_events[fd]->read_cb( my_read_cb(fd, my_loop->fd_events[fd]);
my_loop->fd_events[fd]->userarg);
if (my_loop->fd_events[fd] && if (my_loop->fd_events[fd] &&
my_loop->fd_events[fd]->write_cb && my_loop->fd_events[fd]->write_cb &&
FD_ISSET(fd, &writefds)) FD_ISSET(fd, &writefds))
my_loop->fd_events[fd]->write_cb( my_write_cb(fd, my_loop->fd_events[fd]);
my_loop->fd_events[fd]->userarg);
if (my_loop->fd_events[fd] && if (my_loop->fd_events[fd] &&
my_loop->fd_events[fd]->timeout_cb && my_loop->fd_events[fd]->timeout_cb &&
now > my_loop->fd_timeout_times[fd]) now > my_loop->fd_timeout_times[fd])
my_loop->fd_events[fd]->timeout_cb( my_timeout_cb(now, my_loop->fd_timeout_times[fd], fd, my_loop->fd_events[fd]);
my_loop->fd_events[fd]->userarg);
i = fd; i = fd;
if (my_loop->timeout_events[i] && if (my_loop->timeout_events[i] &&
my_loop->timeout_events[i]->timeout_cb && my_loop->timeout_events[i]->timeout_cb &&
now > my_loop->timeout_times[i]) now > my_loop->timeout_times[i])
my_loop->timeout_events[i]->timeout_cb( my_timeout_cb(now, my_loop->timeout_times[i], -1, my_loop->timeout_events[i]);
my_loop->timeout_events[i]->userarg);
} }
} }