From: Witold Kręcicki <wpk@isc.org>
Date: Wed, 24 Oct 2018 10:52:37 +0000 (+0000)
Subject: Synchronize Windows socket code with API changes.
X-Git-Tag: v9.13.4~20^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca7b5ceee5aeae0e05da99e32615808bf8ce8948;p=thirdparty%2Fbind9.git

Synchronize Windows socket code with API changes.
---

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 32b7ca70dca..37eacc7ba81 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -508,8 +508,6 @@ iocompletionport_init(isc_socketmgr_t *manager) {
 			    strbuf);
 	}
 
-	manager->maxIOCPThreads = min(isc_os_ncpus() + 1, MAX_IOCPTHREADS);
-
 	/* Now Create the Completion Port */
 	manager->hIoCompletionPort = CreateIoCompletionPort(
 			INVALID_HANDLE_VALUE, NULL,
@@ -2538,7 +2536,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
 
 isc_result_t
 isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp,
-		       unsigned int maxsocks)
+		      unsigned int maxsocks, int nthreads)
 {
 	isc_socketmgr_t *manager;
 	isc_result_t result;
@@ -2574,6 +2572,10 @@ isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp,
 	}
 
 	isc_mem_attach(mctx, &manager->mctx);
+	if (nthreads == 0) {
+		nthreads = isc_os_ncpus() + 1;
+	}
+	manager->maxIOCPThreads = min(nthreads, MAX_IOCPTHREADS);
 
 	iocompletionport_init(manager);	/* Create the Completion Ports */