From: Howard Chu <hyc@openldap.org>
Date: Sun, 4 Sep 2005 15:04:09 +0000 (+0000)
Subject: ITS#3802, #3999 skip wake_sds in epoll event loop
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~495
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=784554f1bbf37ea07b33f9a4088ad821a8cefbe6;p=openldap

ITS#3802, #3999 skip wake_sds in epoll event loop
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index e161af4513..a0125a19fc 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1918,6 +1918,10 @@ slapd_daemon_task(
 #endif
 			 ) continue;
 
+			/* Don't log internal wake events */
+			if ( SLAP_EVENT_FD( i ) == wake_sds[0] )
+				continue;
+
 			r = SLAP_EVENT_IS_READ( i );
 			w = SLAP_EVENT_IS_WRITE( i );
 			if ( r || w ) {
@@ -1939,6 +1943,10 @@ slapd_daemon_task(
 			if ( rc ) {
 				fd = SLAP_EVENT_FD( i );
 
+				/* Ignore wake events, they were handled above */
+				if ( fd == wake_sds[0] )
+					continue;
+
 				if( SLAP_EVENT_IS_WRITE( i ) ) {
 					Debug( LDAP_DEBUG_CONNS,
 						"daemon: write active on %d\n",