From: Howard Chu <hyc@openldap.org>
Date: Fri, 21 Jan 2005 00:36:15 +0000 (+0000)
Subject: Import ITS#3471 fix from HEAD - don't yield unnecessarily
X-Git-Tag: OPENLDAP_REL_ENG_2_2_21~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593cb4cecf0e38606b6396faa8ff19d9a37ddf5f;p=thirdparty%2Fopenldap.git

Import ITS#3471 fix from HEAD - don't yield unnecessarily
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 502eacff55..0845ac5963 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1451,6 +1451,7 @@ slapd_daemon_task(
 
 		case 0:		/* timeout - let threads run */
 			ebadf = 0;
+#ifndef HAVE_YIELDING_SELECT
 #ifdef NEW_LOGGING
 			LDAP_LOG( CONNECTION, DETAIL2,
 				   "slapd_daemon_task: select timeout - yielding\n", 0, 0, 0 );
@@ -1460,6 +1461,7 @@ slapd_daemon_task(
 #endif
 
 			ldap_pvt_thread_yield();
+#endif
 			continue;
 
 		default:	/* something happened - deal with it */
@@ -1932,7 +1934,9 @@ slapd_daemon_task(
 				slapd_close( rd );
 			}
 		}
+#ifndef HAVE_YIELDING_SELECT
 		ldap_pvt_thread_yield();
+#endif
 	}
 
 	if( slapd_shutdown == 1 ) {