mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix epoll, just handle wake events in the order they arrived.

Browse Source
This commit is contained in:
Howard Chu 2005-10-30 00:50:59 +00:00
parent 5a654472f5
commit 98969cc28e
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/slapd/daemon.c
View File

@ -2025,18 +2025,10 @@ slapd_daemon_task(
* an event, so we could use pointers to the listener structure
* instead of just the file descriptor. For /dev/poll we have to
* search the listeners array for a matching descriptor.
*
* We now handle wake events when we see them; they are not given
* higher priority.
*/
/* if waking is set and we woke up, we'll read whatever
* we can.
*/
if ( waking ) {
char c[BUFSIZ];
tcp_read( wake_sds[0], c, sizeof(c) );
waking = 0;
ns--;
continue;
}
#ifdef LDAP_DEBUG
Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 );
@ -2084,8 +2076,13 @@ slapd_daemon_task(
if ( rc ) {
fd = SLAP_EVENT_FD( i );
/* Ignore wake events, they were handled above */
if ( fd == wake_sds[0] ) continue;
/* Handle wake events */
if ( fd == wake_sds[0] ) {
char c[BUFSIZ];
tcp_read( wake_sds[0], c, sizeof(c) );
waking = 0;
break;
}
if( SLAP_EVENT_IS_WRITE( i ) ) {
Debug( LDAP_DEBUG_CONNS,