upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-12 15:23:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup epoll read / error behavior

Browse source
This commit is contained in:
Howard Chu 2006-05-14 00:26:33 +00:00
parent 1cf58aba1c
commit 0b79eab474
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/daemon.c
View file

@ -2094,7 +2094,7 @@ slapd_daemon_task(
#endif
for (i=0; i<ns; i++) {
int rc = 1, fd, waswrite = 0;
int rc = 1, fd;
if ( SLAP_EVENT_IS_LISTENER(i) ) {
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
@ -2124,7 +2124,7 @@ slapd_daemon_task(
"daemon: write active on %d\n",
fd, 0, 0 );
waswrite = 1;
SLAP_EVENT_CLR_WRITE( i );
/*
* NOTE: it is possible that the connection was closed
@ -2136,12 +2136,13 @@ slapd_daemon_task(
continue;
}
}
/* If event is a read or an error */
if( SLAP_EVENT_IS_READ( i ) || !waswrite ) {
/* If event is a read */
if( SLAP_EVENT_IS_READ( i )) {
Debug( LDAP_DEBUG_CONNS,
"daemon: read active on %d\n",
fd, 0, 0 );
SLAP_EVENT_CLR_READ( i );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_read_activate( fd );
#else
@ -2153,6 +2154,9 @@ slapd_daemon_task(
*/
connection_read( fd );
#endif
} else {
Debug( LDAP_DEBUG_CONNS,
"daemon: hangup on %d\n", fd, 0, 0 );
}
}
}