upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

faster fix for winsock handler.

Browse source 
git-svn-id: file:///svn/unbound/trunk@1605 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2009-04-17 09:01:52 +00:00
parent 6a152952bf
commit 9f1ee24abb
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -2,6 +2,7 @@
- Fix reentrant in minievent handler for unix. Could have resulted - Fix reentrant in minievent handler for unix. Could have resulted
in spurious event callbacks. in spurious event callbacks.
- timers do not take up a fd slot for winsock handler. - timers do not take up a fd slot for winsock handler.
- faster fix for winsock reentrant check.
16 April 2009: Wouter 16 April 2009: Wouter
- winsock event handler exit very quickly on signal, even if - winsock event handler exit very quickly on signal, even if

27
util/winsock_event.c
View file

@ -97,14 +97,13 @@ find_fd(struct event_base* base, int fd)
/** Find ptr in base array */ /** Find ptr in base array */
static int static int
find_entry(struct event_base* base, struct event* e) zero_waitfor(WSAEVENT waitfor[], WSAEVENT x)
{ {
int i; int i;
for(i=0; i<base->max; i++) { for(i=0; i<WSK_MAX_ITEMS; i++) {
if(base->items[i] == e) if(waitfor[i] == x)
return i; waitfor[i] = 0;
} }
return -1;
} }
void *event_init(uint32_t* time_secs, struct timeval* time_tv) void *event_init(uint32_t* time_secs, struct timeval* time_tv)
@ -226,7 +225,6 @@ static int handle_select(struct event_base* base, struct timeval* wait)
{ {
DWORD timeout = 0; /* in milliseconds */ DWORD timeout = 0; /* in milliseconds */
DWORD ret; DWORD ret;
WSAEVENT waitfor[WSK_MAX_ITEMS];
struct event* eventlist[WSK_MAX_ITEMS]; struct event* eventlist[WSK_MAX_ITEMS];
WSANETWORKEVENTS netev; WSANETWORKEVENTS netev;
int i, numwait = 0, startidx = 0, was_timeout = 0; int i, numwait = 0, startidx = 0, was_timeout = 0;
@ -253,7 +251,9 @@ static int handle_select(struct event_base* base, struct timeval* wait)
if(base->items[i]->ev_fd == -1 && !base->items[i]->is_signal) if(base->items[i]->ev_fd == -1 && !base->items[i]->is_signal)
continue; /* skip timer only events */ continue; /* skip timer only events */
eventlist[numwait] = base->items[i]; eventlist[numwait] = base->items[i];
waitfor[numwait++] = base->items[i]->hEvent; base->waitfor[numwait++] = base->items[i]->hEvent;
if(numwait == WSK_MAX_ITEMS)
break; /* sanity check */
} }
log_assert(numwait <= WSA_MAXIMUM_WAIT_EVENTS); log_assert(numwait <= WSA_MAXIMUM_WAIT_EVENTS);
verbose(VERB_CLIENT, "winsock_event bmax=%d numwait=%d wait=%x " verbose(VERB_CLIENT, "winsock_event bmax=%d numwait=%d wait=%x "
@ -267,7 +267,7 @@ static int handle_select(struct event_base* base, struct timeval* wait)
} }
was_timeout = 1; was_timeout = 1;
} else { } else {
ret = WSAWaitForMultipleEvents(numwait, waitfor, ret = WSAWaitForMultipleEvents(numwait, base->waitfor,
0 /* do not wait for all, just one will do */, 0 /* do not wait for all, just one will do */,
wait?timeout:WSA_INFINITE, wait?timeout:WSA_INFINITE,
0); /* we are not alertable (IO completion events) */ 0); /* we are not alertable (IO completion events) */
@ -298,8 +298,8 @@ static int handle_select(struct event_base* base, struct timeval* wait)
verbose(VERB_CLIENT, "winsock_event signals"); verbose(VERB_CLIENT, "winsock_event signals");
for(i=startidx; i<numwait; i++) { for(i=startidx; i<numwait; i++) {
if(find_entry(base, eventlist[i]) == -1) if(!base->waitfor[i])
continue; /* event was deleted */ continue; /* was deleted */
if(eventlist[i]->is_signal) { if(eventlist[i]->is_signal) {
eventlist[i]->just_checked = 0; eventlist[i]->just_checked = 0;
handle_signal(eventlist[i]); handle_signal(eventlist[i]);
@ -315,8 +315,8 @@ static int handle_select(struct event_base* base, struct timeval* wait)
/* eventlist[i] fired */ /* eventlist[i] fired */
/* see if eventlist[i] is still valid and just checked from /* see if eventlist[i] is still valid and just checked from
* WSAWaitForEvents */ * WSAWaitForEvents */
if(find_entry(base, eventlist[i]) == -1) if(!base->waitfor[i])
continue; /* does not exist anymore */ continue; /* was deleted */
if(!eventlist[i]->just_checked) if(!eventlist[i]->just_checked)
continue; /* added by other callback */ continue; /* added by other callback */
if(eventlist[i]->is_signal) if(eventlist[i]->is_signal)
@ -324,7 +324,7 @@ static int handle_select(struct event_base* base, struct timeval* wait)
eventlist[i]->just_checked = 0; eventlist[i]->just_checked = 0;
if(WSAEnumNetworkEvents(eventlist[i]->ev_fd, if(WSAEnumNetworkEvents(eventlist[i]->ev_fd,
waitfor[i], /* reset the event handle */ base->waitfor[i], /* reset the event handle */
/*NULL,*/ /* do not reset the event handle */ /*NULL,*/ /* do not reset the event handle */
&netev) != 0) { &netev) != 0) {
log_err("WSAEnumNetworkEvents failed: %s", log_err("WSAEnumNetworkEvents failed: %s",
@ -588,6 +588,7 @@ int event_del(struct event *ev)
ev->ev_base->max--; ev->ev_base->max--;
if(ev->idx < ev->ev_base->max) if(ev->idx < ev->ev_base->max)
ev->ev_base->items[ev->idx]->idx = ev->idx; ev->ev_base->items[ev->idx]->idx = ev->idx;
zero_waitfor(base->waitfor, ev->hEvent);
if(WSAEventSelect(ev->ev_fd, ev->hEvent, 0) != 0) if(WSAEventSelect(ev->ev_fd, ev->hEvent, 0) != 0)
log_err("WSAEventSelect(disable) failed: %s", log_err("WSAEventSelect(disable) failed: %s",

3
util/winsock_event.h
View file

@ -145,7 +145,8 @@ struct event_base
* event_add a sudden interest in the event has incepted. * event_add a sudden interest in the event has incepted.
*/ */
int tcp_reinvigorated; int tcp_reinvigorated;
/** The list of events that is currently being processed. */
WSAEVENT waitfor[WSK_MAX_ITEMS];
}; };
/** /**