mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

2220. [bug] win32: Address a race condition in final shutdown of

Browse Source 
the Windows socket code. [RT #17028]
This commit is contained in:
Mark Andrews
2007-08-28 00:39:15 +00:00
parent 88a4de3c24
commit 8e74bfb604
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2220. [bug] win32: Address a race condition in final shutdown of
the Windows socket code. [RT #17028]
2219. [bug] Apply zone consistancy checks to additions, not 2219. [bug] Apply zone consistancy checks to additions, not
removals, when updating. [RT #17049] removals, when updating. [RT #17049]

27
lib/isc/win32/socket.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.51 2007/06/18 23:47:49 tbox Exp $ */ /* $Id: socket.c,v 1.52 2007/08/28 00:39:15 marka Exp $ */
/* This code has been rewritten to take advantage of Windows Sockets /* This code has been rewritten to take advantage of Windows Sockets
* I/O Completion Ports and Events. I/O Completion Ports is ONLY * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -662,10 +662,11 @@ socket_eventlist_add(event_change_t *evchange, sock_event_list *evlist,
/* /*
* Note that the eventLock is locked before calling this function. * Note that the eventLock is locked before calling this function.
* All Events and associated sockets are closed here.
*/ */
isc_boolean_t isc_boolean_t
socket_eventlist_delete(event_change_t *evchange, sock_event_list *evlist) { socket_eventlist_delete(event_change_t *evchange, sock_event_list *evlist,
isc_socketmgr_t *manager)
{
int i; int i;
WSAEVENT hEvent; WSAEVENT hEvent;
int iEvent = -1; int iEvent = -1;
@@ -712,12 +713,16 @@ socket_eventlist_delete(event_change_t *evchange, sock_event_list *evlist) {
evchange->sock->pending_send == 0 && evchange->sock->pending_send == 0 &&
evchange->sock->pending_free) { evchange->sock->pending_free) {
evchange->sock->pending_free = 0; evchange->sock->pending_free = 0;
ISC_LIST_UNLINK(manager->socklist, evchange->sock, link);
dofree = ISC_TRUE; dofree = ISC_TRUE;
} }
UNLOCK(&evchange->sock->lock); UNLOCK(&evchange->sock->lock);
if (dofree) if (dofree)
free_socket(&evchange->sock); free_socket(&evchange->sock);
if (ISC_LIST_EMPTY(manager->socklist))
SIGNAL(&manager->shutdown_ok);
evlist->max_event--; evlist->max_event--;
evlist->total_events--; evlist->total_events--;
@@ -756,7 +761,8 @@ process_eventlist(sock_event_list *evlist, isc_socketmgr_t *manager) {
next = ISC_LIST_NEXT(evchange, link); next = ISC_LIST_NEXT(evchange, link);
del = ISC_FALSE; del = ISC_FALSE;
if (evchange->action == EVENT_DELETE) { if (evchange->action == EVENT_DELETE) {
del = socket_eventlist_delete(evchange, evlist); del = socket_eventlist_delete(evchange, evlist,
manager);
/* /*
* Delete only if this thread's socket list was * Delete only if this thread's socket list was
@@ -1749,8 +1755,8 @@ destroy_socket(isc_socket_t **sockp) {
sock->pending_close != 0) { sock->pending_close != 0) {
dofree = ISC_FALSE; dofree = ISC_FALSE;
sock->pending_free = 1; sock->pending_free = 1;
} } else
ISC_LIST_UNLINK(manager->socklist, sock, link); ISC_LIST_UNLINK(manager->socklist, sock, link);
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
if (ISC_LIST_EMPTY(manager->socklist)) if (ISC_LIST_EMPTY(manager->socklist))
@@ -2617,8 +2623,15 @@ SocketIoThread(LPVOID ThreadContext) {
dofree = ISC_TRUE; dofree = ISC_TRUE;
} }
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
if (dofree) if (dofree) {
LOCK(&manager->lock);
ISC_LIST_UNLINK(manager->socklist,
sock, link);
free_socket(&sock); free_socket(&sock);
if (ISC_LIST_EMPTY(manager->socklist))
SIGNAL(&manager->shutdown_ok);
UNLOCK(&manager->lock);
}
if (lpo != NULL) if (lpo != NULL)
HeapFree(hHeapHandle, 0, lpo); HeapFree(hHeapHandle, 0, lpo);
continue; continue;