From: Howard Chu <hyc@openldap.org>
Date: Fri, 6 Jan 2006 06:07:36 +0000 (+0000)
Subject: ITS#3950 tweak prev commit, s/REPLACE_SCHED_YIELD/REPLACE_BROKEN_YIELD/
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~448
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d1693d4a079084c8cf4c13a253558cfa8d85733d;p=openldap

ITS#3950 tweak prev commit, s/REPLACE_SCHED_YIELD/REPLACE_BROKEN_YIELD/
---

diff --git a/configure b/configure
index 5c042d11de..73483f1148 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.614 2006/01/06 04:41:42 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.615 2006/01/06 04:50:53 kurt Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -24743,17 +24743,17 @@ echo "$as_me: error: pthread_create is not usable, check environment settings" >
    { (exit 1); exit 1; }; }
 			fi
 
-			ol_replace_sched_yield=no
+			ol_replace_broken_yield=no
 			case "$target" in
 			*-*-linux*)
-				ol_replace_sched_yield=yes
+				ol_replace_broken_yield=yes
 			;;
 			esac
 
-			if test $ol_replace_sched_yield = yes ; then
+			if test $ol_replace_broken_yield = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define REPLACE_SCHED_YIELD 1
+#define REPLACE_BROKEN_YIELD 1
 _ACEOF
 
 			fi
diff --git a/configure.in b/configure.in
index 5b4dea7cda..707abf248c 100644
--- a/configure.in
+++ b/configure.in
@@ -1587,16 +1587,16 @@ dnl			[ol_cv_pthread_lpthread_lexc])
 				AC_MSG_ERROR([pthread_create is not usable, check environment settings])
 			fi
 
-			ol_replace_sched_yield=no
+			ol_replace_broken_yield=no
 			case "$target" in
 			*-*-linux*) 
-				ol_replace_sched_yield=yes
+				ol_replace_broken_yield=yes
 			;;
 			esac
 
-			if test $ol_replace_sched_yield = yes ; then
-				AC_DEFINE([REPLACE_SCHED_YIELD],1,
-					[define to replace sched_yield(2)])
+			if test $ol_replace_broken_yield = yes ; then
+				AC_DEFINE([REPLACE_BROKEN_YIELD],1,
+					[define if sched_yield yields the entire process])
 			fi
 
 			dnl Check if select causes an yield
diff --git a/include/portable.hin b/include/portable.hin
index dce849a9c2..4983684d22 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -912,8 +912,8 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* define to replace sched_yield(2) */
-#undef REPLACE_SCHED_YIELD
+/* define if sched_yield yields the entire process */
+#undef REPLACE_BROKEN_YIELD
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
index 31b2ac58d4..c867e5715b 100644
--- a/libraries/libldap_r/thr_posix.c
+++ b/libraries/libldap_r/thr_posix.c
@@ -20,7 +20,7 @@
 
 #include <ac/errno.h>
 
-#ifdef REPLACE_SCHED_YIELD
+#ifdef REPLACE_BROKEN_YIELD
 #ifndef HAVE_NANOSLEEP
 #include <ac/socket.h>
 #endif
@@ -214,7 +214,7 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 int 
 ldap_pvt_thread_yield( void )
 {
-#ifdef REPLACE_SCHED_YIELD
+#ifdef REPLACE_BROKEN_YIELD
 #ifdef HAVE_NANOSLEEP
 	struct timespec t = { 0, 0 };
 	nanosleep(&t, NULL);