Attachment 317192 Details for Bug 462060 – proposed patch

[patch] proposed patch

bind92-rh462060.patch (text/plain), 2.31 KB, created by Adam Tkac on 2008-09-19 13:36:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Tkac

Created: 2008-09-19 13:36:45 UTC

Size: 2.31 KB

patch

obsolete

>diff -up bind-9.2.4/lib/isc/unix/socket.c.rh462060 bind-9.2.4/lib/isc/unix/socket.c
>--- bind-9.2.4/lib/isc/unix/socket.c.rh462060	2008-09-19 13:19:36.000000000 +0200
>+++ bind-9.2.4/lib/isc/unix/socket.c	2008-09-19 14:27:38.000000000 +0200
>@@ -314,11 +314,19 @@ wakeup_socket(isc_socketmgr_t *manager, 
> 
> 	INSIST(fd >= 0 && fd < (int)FD_SETSIZE);
> 
>-	if (manager->fdstate[fd] == CLOSE_PENDING) {
>+	if (msg == SELECT_POKE_CLOSE) {
>+		/* No one should be updating fdstate, so no need to lock it */
>+		INSIST(manager->fdstate[fd] == CLOSE_PENDING);
> 		manager->fdstate[fd] = CLOSED;
> 		FD_CLR(fd, &manager->read_fds);
> 		FD_CLR(fd, &manager->write_fds);
>-		close(fd);
>+		(void)close(fd);
>+		return;
>+	}
>+
>+	if (manager->fdstate[fd] == CLOSE_PENDING) {
>+		FD_CLR(fd, &manager->read_fds);
>+		FD_CLR(fd, &manager->write_fds);
> 		return;
> 	}
> 	if (manager->fdstate[fd] != MANAGED)
>@@ -2127,12 +2135,8 @@ process_fds(isc_socketmgr_t *manager, in
> #endif /* ISC_PLATFORM_USETHREADS */
> 
> 		if (manager->fdstate[i] == CLOSE_PENDING) {
>-			manager->fdstate[i] = CLOSED;
> 			FD_CLR(i, &manager->read_fds);
> 			FD_CLR(i, &manager->write_fds);
>-
>-			close(i);
>-
> 			continue;
> 		}
> 
>@@ -2229,6 +2233,7 @@ watcher(void *uap) {
> 			LOCK(&manager->lock);
> 		} while (cc < 0);
> 
>+		process_fds(manager, maxfd, &readfds, &writefds);
> 
> 		/*
> 		 * Process reads on internal, control fd.
>@@ -2271,8 +2276,6 @@ watcher(void *uap) {
> 				wakeup_socket(manager, fd, msg);
> 			}
> 		}
>-
>-		process_fds(manager, maxfd, &readfds, &writefds);
> 	}
> 
> 	manager_log(manager, TRACE,
>@@ -2530,7 +2533,7 @@ socket_recv(isc_socket_t *sock, isc_sock
> 		 * Enqueue the request.  If the socket was previously not being
> 		 * watched, poke the watcher to start paying attention to it.
> 		 */
>-		if (ISC_LIST_EMPTY(sock->recv_list))
>+		if (ISC_LIST_EMPTY(sock->recv_list) && !sock->pending_recv)
> 			select_poke(sock->manager, sock->fd, SELECT_POKE_READ);
> 		ISC_LIST_ENQUEUE(sock->recv_list, dev, ev_link);
> 
>@@ -2723,7 +2726,8 @@ socket_send(isc_socket_t *sock, isc_sock
> 			 * not being watched, poke the watcher to start
> 			 * paying attention to it.
> 			 */
>-			if (ISC_LIST_EMPTY(sock->send_list))
>+			if (ISC_LIST_EMPTY(sock->send_list) &&
>+			    !sock->pending_send)
> 				select_poke(sock->manager, sock->fd,
> 					    SELECT_POKE_WRITE);
> 			ISC_LIST_ENQUEUE(sock->send_list, dev, ev_link);

Actions: View | Diff

Attachments on bug 462060: 317192