ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

WiP: shutdown active sockets when shutting down netmgr

Browse Source
This commit is contained in:
Witold Kręcicki
2019-11-22 14:13:19 +01:00
parent 7ff5f95865
commit ea4e56b89d
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/isc/netmgr/netmgr-int.h
View File

@@ -116,12 +116,9 @@ typedef enum isc__netievent_type {
netievent_tcpstoplisten,
netievent_tcpclose,
netievent_closecb,
netievent_shutdown,
} isc__netievent_type;
typedef struct isc__netievent_stop {
isc__netievent_type type;
} isc__netievent_stop_t;
/*
* We have to split it because we can read and write on a socket
* simultaneously.
@@ -187,6 +184,7 @@ typedef isc__netievent__socket_t isc__netievent_startread_t;
typedef isc__netievent__socket_t isc__netievent_pauseread_t;
typedef isc__netievent__socket_t isc__netievent_resumeread_t;
typedef isc__netievent__socket_t isc__netievent_closecb_t;
typedef isc__netievent__socket_t isc__netievent_closecb_t;
typedef struct isc__netievent__socket_req {
isc__netievent_type type;
@@ -209,10 +207,13 @@ typedef struct isc__netievent {
isc__netievent_type type;
} isc__netievent_t;
typedef isc__netievent_t isc__netievent_shutdown_t;
typedef isc__netievent_t isc__netievent_stop_t;
typedef union {
isc__netievent_t ni;
isc__netievent_stop_t nis;
isc__netievent_udplisten_t niul;
isc__netievent__socket_t nis;
isc__netievent__socket_req_t nisr;
isc__netievent_udpsend_t nius;
} isc__netievent_storage_t;
@@ -512,6 +513,13 @@ isc__nm_async_closecb(isc__networker_t *worker, isc__netievent_t *ievent0);
* Issue a 'handle closed' callback on the socket.
*/
void
isc__nm_async_shutdown(isc__networker_t *worker, isc__netievent_t *ievent0);
/*%<
* Walk through all uv handles, get the underlying sockets and issue
* close on them.
*/
isc_result_t
isc__nm_udp_send(isc_nmhandle_t *handle, isc_region_t *region,
isc_nm_cb_t cb, void *cbarg);

31
lib/isc/netmgr/netmgr.c
View File

@@ -309,6 +309,12 @@ isc_nm_destroy(isc_nm_t **mgr0) {
mgr = *mgr0;
*mgr0 = NULL;
for (size_t i = 0; i < mgr->nworkers; i++) {
isc__netievent_t *event = NULL;
event = isc__nm_get_ievent(mgr, netievent_shutdown);
isc__nm_enqueue_ievent(&mgr->workers[i], event);
}
/*
* Wait for the manager to be dereferenced elsehwere.
*/
@@ -512,6 +518,9 @@ async_cb(uv_async_t *handle) {
case netievent_closecb:
isc__nm_async_closecb(worker, ievent);
break;
case netievent_shutdown:
isc__nm_async_shutdown(worker, ievent);
break;
default:
INSIST(0);
ISC_UNREACHABLE();
@@ -1174,6 +1183,28 @@ isc__nm_async_closecb(isc__networker_t *worker, isc__netievent_t *ievent0) {
isc_nmsocket_detach(&ievent->sock);
}
static void
shutdown_walk_cb(uv_handle_t *handle, void *arg) {
UNUSED(arg);
isc_nmsocket_t *sock;
switch(handle->type) {
case UV_TCP:
case UV_UDP:
sock = (isc_nmsocket_t*) handle->data;
INSIST(VALID_NMSOCK(sock));
isc__nmsocket_prep_destroy(sock);
break;
default:
break;
}
}
void
isc__nm_async_shutdown(isc__networker_t *worker, isc__netievent_t *ievent0) {
UNUSED(ievent0);
uv_walk(&worker->loop, shutdown_walk_cb, NULL);
}
bool
isc__nm_acquire_interlocked(isc_nm_t *mgr) {
LOCK(&mgr->lock);