mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

Remove some code that may make tests fail, although it's unlikely...

Browse Source
This commit is contained in:
Michael Graff
2005-12-07 03:55:06 +00:00
parent 05c39b1afc
commit 03aa32f0ab
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/isc/unix/socket.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.259 2005/12/06 18:11:54 explorer Exp $ */ /* $Id: socket.c,v 1.260 2005/12/07 03:55:06 explorer Exp $ */
/*! \file */ /*! \file */
@@ -1727,11 +1727,8 @@ dispatch_recv(isc_socket_t *sock) {
if (sock->type != isc_sockettype_fdwatch) { if (sock->type != isc_sockettype_fdwatch) {
ev = ISC_LIST_HEAD(sock->recv_list); ev = ISC_LIST_HEAD(sock->recv_list);
if (ev == NULL) { if (ev == NULL)
socket_log(sock, NULL, EVENT, NULL, 0, 0,
"dispatch_recv: no pending reads");
return; return;
}
socket_log(sock, NULL, EVENT, NULL, 0, 0, socket_log(sock, NULL, EVENT, NULL, 0, 0,
"dispatch_recv: event %p -> task %p", "dispatch_recv: event %p -> task %p",
ev, ev->ev_sender); ev, ev->ev_sender);
@@ -1758,19 +1755,25 @@ static void
dispatch_send(isc_socket_t *sock) { dispatch_send(isc_socket_t *sock) {
intev_t *iev; intev_t *iev;
isc_socketevent_t *ev; isc_socketevent_t *ev;
isc_task_t *sender;
INSIST(!sock->pending_send); INSIST(!sock->pending_send);
ev = ISC_LIST_HEAD(sock->send_list); if (sock->type != isc_sockettype_fdwatch) {
if (ev == NULL) ev = ISC_LIST_HEAD(sock->send_list);
return; if (ev == NULL)
return;
socket_log(sock, NULL, EVENT, NULL, 0, 0,
"dispatch_send: event %p -> task %p",
ev, ev->ev_sender);
sender = ev->ev_sender;
} else {
sender = sock->fdwatchtask;
}
sock->pending_send = 1; sock->pending_send = 1;
iev = &sock->writable_ev; iev = &sock->writable_ev;
socket_log(sock, NULL, EVENT, NULL, 0, 0,
"dispatch_send: event %p -> task %p", ev, ev->ev_sender);
sock->references++; sock->references++;
iev->ev_sender = sock; iev->ev_sender = sock;
if (sock->type == isc_sockettype_fdwatch) if (sock->type == isc_sockettype_fdwatch)
@@ -1779,7 +1782,7 @@ dispatch_send(isc_socket_t *sock) {
iev->ev_action = internal_send; iev->ev_action = internal_send;
iev->ev_arg = sock; iev->ev_arg = sock;
isc_task_send(ev->ev_sender, (isc_event_t **)&iev); isc_task_send(sender, (isc_event_t **)&iev);
} }
/* /*
@@ -2334,17 +2337,17 @@ process_fds(isc_socketmgr_t *manager, int maxfd,
/* /*
* If we need to close the socket, do it now. * If we need to close the socket, do it now.
*/ */
if (manager->fdstate[i] == CLOSE_PENDING) { if (manager->fdstate[i] == CLOSE_PENDING
|| manager->fdstate[i] == MANAGER_CLOSE_PENDING) {
manager->fdstate[i] = CLOSED; manager->fdstate[i] = CLOSED;
FD_CLR(i, &manager->read_fds); FD_CLR(i, &manager->read_fds);
FD_CLR(i, &manager->write_fds); FD_CLR(i, &manager->write_fds);
(void)close(i); if (manager->fdstate[i] == CLOSE_PENDING)
(void)close(i);
continue; continue;
} }
if (manager->fdstate[i] != MANAGED)
continue;
sock = manager->fds[i]; sock = manager->fds[i];
unlock_sock = ISC_FALSE; unlock_sock = ISC_FALSE;