2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00

cltfd is only needed when select is being used

This commit is contained in:
Mark Andrews
2011-08-25 08:17:54 +00:00
parent 00abae4d07
commit 32f5f15b58

View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.346 2011/08/24 23:17:52 marka Exp $ */ /* $Id: socket.c,v 1.347 2011/08/25 08:17:54 marka Exp $ */
/*! \file */ /*! \file */
@@ -3784,7 +3784,6 @@ static isc_threadresult_t
watcher(void *uap) { watcher(void *uap) {
isc__socketmgr_t *manager = uap; isc__socketmgr_t *manager = uap;
isc_boolean_t done; isc_boolean_t done;
int ctlfd;
int cc; int cc;
#ifdef USE_KQUEUE #ifdef USE_KQUEUE
const char *fnname = "kevent()"; const char *fnname = "kevent()";
@@ -3796,16 +3795,21 @@ watcher(void *uap) {
#elif defined (USE_SELECT) #elif defined (USE_SELECT)
const char *fnname = "select()"; const char *fnname = "select()";
int maxfd; int maxfd;
int ctlfd;
#endif #endif
char strbuf[ISC_STRERRORSIZE]; char strbuf[ISC_STRERRORSIZE];
#ifdef ISC_SOCKET_USE_POLLWATCH #ifdef ISC_SOCKET_USE_POLLWATCH
pollstate_t pollstate = poll_idle; pollstate_t pollstate = poll_idle;
#endif #endif
isc_os_minprivs();
#if defined (USE_SELECT)
/* /*
* Get the control fd here. This will never change. * Get the control fd here. This will never change.
*/ */
ctlfd = manager->pipe_fds[0]; ctlfd = manager->pipe_fds[0];
#endif
done = ISC_FALSE; done = ISC_FALSE;
while (!done) { while (!done) {
do { do {