Module Name: src
Committed By: christos
Date: Mon Jun 1 18:55:37 UTC 2020
Modified Files:
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
Locking protocol changed; the internal routines are now called with the
socket locked. Adjust for that.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mpl/bind/dist/lib/isc/unix/socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/dist/lib/isc/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.15 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.16
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.15 Sun May 31 13:45:02 2020
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Mon Jun 1 14:55:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.15 2020/05/31 17:45:02 christos Exp $ */
+/* $NetBSD: socket.c,v 1.16 2020/06/01 18:55:37 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3174,7 +3174,6 @@ internal_fdwatch_write(isc__socket_t *so
INSIST(VALID_SOCKET(sock));
- LOCK(&sock->lock);
isc_refcount_increment(&sock->references);
UNLOCK(&sock->lock);
@@ -3192,8 +3191,6 @@ internal_fdwatch_write(isc__socket_t *so
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_WRITE);
-
- UNLOCK(&sock->lock);
}
static void
@@ -3203,7 +3200,6 @@ internal_fdwatch_read(isc__socket_t *soc
INSIST(VALID_SOCKET(sock));
- LOCK(&sock->lock);
isc_refcount_increment(&sock->references);
UNLOCK(&sock->lock);
@@ -3221,8 +3217,6 @@ internal_fdwatch_read(isc__socket_t *soc
if (more_data)
select_poke(sock->manager, sock->threadid, sock->fd,
SELECT_POKE_READ);
-
- UNLOCK(&sock->lock);
}
/*
