[Python-checkins] r43249 - in python/trunk: Misc/NEWS Python/thread_pthread.h

Thu Mar 23 13:32:37 CET 2006

Author: hyeshik.chang
Date: Thu Mar 23 13:32:36 2006
New Revision: 43249
Modified:
 python/trunk/Misc/NEWS
 python/trunk/Python/thread_pthread.h
Log:
Patch #1396919: Reenable the system scope threads on FreeBSD 5.4
and later versions because they bumped the default setting to
get our basic tests to run correctly..
Modified: python/trunk/Misc/NEWS
==============================================================================

--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Mar 23 13:32:36 2006
@@ -12,6 +12,9 @@
 Core and builtins
 -----------------
 
+- Patch #1396919: The system scope threads are reenabled on FreeBSD
+ 5.4 and later versions.
+
 - Bug #1115379: Compiling a Unicode string with an encoding declaration
 now gives a SyntaxError.
 
Modified: python/trunk/Python/thread_pthread.h
==============================================================================
--- python/trunk/Python/thread_pthread.h	(original)
+++ python/trunk/Python/thread_pthread.h	Thu Mar 23 13:32:36 2006
@@ -26,6 +26,16 @@
 #endif
 #endif
 
+/* Before FreeBSD 5.4, system scope threads was very limited resource
+ in default setting. So the process scope is preferred to get
+ enough number of threads to work. */
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
+#undef PTHREAD_SYSTEM_SCHED_SUPPORTED
+#endif
+#endif
+
 #if !defined(pthread_attr_default)
 # define pthread_attr_default ((pthread_attr_t *)NULL)
 #endif
@@ -138,7 +148,7 @@
 #ifdef THREAD_STACK_SIZE
 	pthread_attr_setstacksize(&attrs, THREAD_STACK_SIZE);
 #endif
-#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) && !defined(__FreeBSD__)
+#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
 #endif
 
