upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 06:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't doublelock fdlock on Solaris

Browse source
This commit is contained in:
Witold Krecicki 2018-10-26 14:22:02 +02:00 committed by Witold Kręcicki
parent ca7b5ceee5
commit 3f7d79e574
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/isc/unix/socket.c
View file

@ -736,7 +736,6 @@ watch_fd(isc__socketthread_t *thread, int fd, int msg) {
pfd.events = POLLOUT;
pfd.fd = fd;
pfd.revents = 0;
LOCK(&thread->fdlock[lockid]);
if (write(thread->devpoll_fd, &pfd, sizeof(pfd)) == -1)
result = isc__errno2result(errno);
else {
@ -745,7 +744,6 @@ watch_fd(isc__socketthread_t *thread, int fd, int msg) {
else
thread->fdpollinfo[fd].want_write = 1;
}
UNLOCK(&thread->fdlock[lockid]);
return (result);
#elif defined(USE_SELECT)
@ -817,7 +815,6 @@ unwatch_fd(isc__socketthread_t *thread, int fd, int msg) {
* only provides a way of canceling per FD, we may need to re-poll the
* socket for the other operation.
*/
LOCK(&thread->fdlock[lockid]);
if (msg == SELECT_POKE_READ &&
thread->fdpollinfo[fd].want_write == 1) {
pfds[1].events = POLLOUT;
@ -839,7 +836,6 @@ unwatch_fd(isc__socketthread_t *thread, int fd, int msg) {
else
thread->fdpollinfo[fd].want_write = 0;
}
UNLOCK(&thread->fdlock[lockid]);
return (result);
#elif defined(USE_SELECT)
@ -3134,7 +3130,6 @@ internal_recv(isc__socket_t *sock) {
dev = ISC_LIST_HEAD(sock->recv_list);
if (dev == NULL) {
goto finish;
return;
}
socket_log(sock, NULL, IOEVENT,