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

correctly allocate and free memory for eventloop hashes

This commit is contained in:
Neil Cook 2017-01-18 15:31:01 +00:00
parent fd3e0c01f7
commit dad4aaf6d8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/extension/default_eventloop.c
View File

@ -47,14 +47,18 @@ _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\n", id); DEBUG_SCHED("default_eventloop: add_event with id %d\n", id);
ev->id = id; _getdns_eventloop_info* myevent = calloc(1, sizeof(_getdns_eventloop_info));
HASH_ADD_INT(*events, id, ev); myevent->event = ev->event;
myevent->id = id;
myevent->timeout_time = ev->timeout_time;
HASH_ADD_INT(*events, id, myevent);
} }
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\n", ev->id); DEBUG_SCHED("default_eventloop: delete_event with id %d\n", ev->id);
HASH_DEL(*events, ev); HASH_DEL(*events, ev);
free(ev);
} }
static uint64_t get_now_plus(uint64_t amount) static uint64_t get_now_plus(uint64_t amount)
@ -113,13 +117,12 @@ default_eventloop_schedule(getdns_eventloop *loop,
/* cleanup the old event if it exists */ /* cleanup the old event if it exists */
if (fd_event) { if (fd_event) {
delete_event(&default_loop->fd_events, fd_event); delete_event(&default_loop->fd_events, fd_event);
free(fd_event);
} }
fd_event = calloc(1, sizeof(_getdns_eventloop_info)); _getdns_eventloop_info fd_ev;
fd_event->event = event;
fd_event->timeout_time = get_now_plus(timeout);
add_event(&default_loop->fd_events, fd, fd_event);
event->ev = (void *) (intptr_t) (fd + 1); event->ev = (void *) (intptr_t) (fd + 1);
fd_ev.event = event;
fd_ev.timeout_time = get_now_plus(timeout);
add_event(&default_loop->fd_events, fd, &fd_ev);
DEBUG_SCHED( "scheduled read/write at fd %d\n", fd); DEBUG_SCHED( "scheduled read/write at fd %d\n", fd);
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
@ -137,12 +140,11 @@ default_eventloop_schedule(getdns_eventloop *loop,
event->write_cb = NULL; event->write_cb = NULL;
} }
for (i = 0; i < default_loop->max_timeouts; i++) { for (i = 0; i < default_loop->max_timeouts; i++) {
_getdns_eventloop_info* timeout_event = NULL; if (find_event(&default_loop->timeout_events, i) == NULL) {
if ((timeout_event = find_event(&default_loop->timeout_events, i)) == NULL) { _getdns_eventloop_info timeout_ev;
timeout_event = calloc(1, sizeof(_getdns_eventloop_info)); timeout_ev.event = event;
timeout_event->event = event; timeout_ev.timeout_time = get_now_plus(timeout);
timeout_event->timeout_time = get_now_plus(timeout); add_event(&default_loop->timeout_events, i, &timeout_ev);
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 slot %d\n", (int)i); DEBUG_SCHED( "scheduled timeout at slot %d\n", (int)i);
@ -179,7 +181,6 @@ default_eventloop_clear(getdns_eventloop *loop, getdns_eventloop_event *event)
#endif #endif
if (timeout_event) { if (timeout_event) {
delete_event(&default_loop->timeout_events, timeout_event); delete_event(&default_loop->timeout_events, timeout_event);
free(timeout_event);
} }
} else { } else {
_getdns_eventloop_info* fd_event = find_event(&default_loop->fd_events, i); _getdns_eventloop_info* fd_event = find_event(&default_loop->fd_events, i);
@ -191,7 +192,6 @@ default_eventloop_clear(getdns_eventloop *loop, getdns_eventloop_event *event)
#endif #endif
if (fd_event) { if (fd_event) {
delete_event(&default_loop->fd_events, fd_event); delete_event(&default_loop->fd_events, fd_event);
free(fd_event);
} }
} }
event->ev = NULL; event->ev = NULL;