Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mpl/bind/dist/lib/isc/unix sync with regular socket...



details:   https://anonhg.NetBSD.org/src/rev/afc25e554571
branches:  trunk
changeset: 1010660:afc25e554571
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 31 17:45:02 2020 +0000

description:
sync with regular socket code (no effect)

diffstat:

 external/mpl/bind/dist/lib/isc/unix/socket.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 4c6d40340489 -r afc25e554571 external/mpl/bind/dist/lib/isc/unix/socket.c
--- a/external/mpl/bind/dist/lib/isc/unix/socket.c      Sun May 31 16:36:07 2020 +0000
+++ b/external/mpl/bind/dist/lib/isc/unix/socket.c      Sun May 31 17:45:02 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.c,v 1.14 2020/05/24 19:46:27 christos Exp $     */
+/*     $NetBSD: socket.c,v 1.15 2020/05/31 17:45:02 christos Exp $     */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -5739,13 +5739,17 @@
 #if defined(USE_EPOLL)
        manager->epoll_events[sock->fd] = 0;
 #endif
+#ifdef USE_DEVPOLL
+       INSIST(thread->fdpollinfo[sock->fd].want_read == 0 &&
+              thread->fdpollinfo[sock->fd].want_write == 0);
+#endif /* ifdef USE_DEVPOLL */
        UNLOCK(&thread->fdlock[lockid]);
 
        LOCK(&manager->lock);
        ISC_LIST_APPEND(manager->socklist, sock, link);
 #ifdef USE_SELECT
-       if (manager->maxfd < sock->fd)
-               manager->maxfd = sock->fd;
+       if (thread->maxfd < sock->fd)
+               thread->maxfd = sock->fd;
 #endif
        UNLOCK(&manager->lock);
 



Home | Main Index | Thread Index | Old Index