Changeset 7493

Timestamp:

09/27/07 12:36:41

Author:

robert

Message:

From Mathias Froelich, "the long promised patch to implement the sched_setaffinity in a way that
matches the system it is compiled on.
That is there is a cmake configure test to make sure we use the version
available on the system

There are also various improovements to other system specific methods for less
common architectures.

The attached files arebased on rev 7491. The CMakeLists.txt file is the one in
src/OpenThreads/pthreads/CMakeLists.txt
"

Files:

• OpenThreads/trunk/src/OpenThreads/pthreads/CMakeLists.txt (modified) (2 diffs)
• OpenThreads/trunk/src/OpenThreads/pthreads/PThread.c++ (modified) (9 diffs)

OpenThreads/trunk/src/OpenThreads/pthreads/CMakeLists.txt

@@ -1 +1 @@
-# This file should only be included when using Pthreads
+
+INCLUDE (CheckFunctionExists)
+INCLUDE (CheckLibraryExists)
+INCLUDE (CheckSymbolExists)
+INCLUDE (CheckCXXSourceCompiles)
-
-SET(LIB_NAME OpenThreads)
@@ -18 +23 @@
-)
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    OPTION(TWO_PARAM_sched_setaffinity "Set to ON to use the two parameter sched_setaffinity (required on older rev's of RedHat)" OFF)
-    IF(TWO_PARAM_sched_setaffinity)
-      ADD_DEFINITIONS(-DCOMPILE_USING_TWO_PARAM_sched_setaffinity)
-    ENDIF(TWO_PARAM_sched_setaffinity)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
-IF(OPENTHREADS_SONAMES)
-  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
-ENDIF(OPENTHREADS_SONAMES)
+
+SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
+SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")
+
+CHECK_FUNCTION_EXISTS(pthread_yield HAVE_PTHREAD_YIELD)
+IF(HAVE_PTHREAD_YIELD)
+  ADD_DEFINITIONS(-DHAVE_PTHREAD_YIELD)
+ELSE(HAVE_PTHREAD_YIELD)
+  # sched_yield appears not in libc, pthreads or whatever on some systems
+  CHECK_FUNCTION_EXISTS(sched_yield HAVE_SCHED_YIELD)
+  IF(NOT HAVE_SCHED_YIELD)
+    CHECK_LIBRARY_EXISTS(rt sched_yield "" HAVE_SCHED_YIELD)
+    IF(HAVE_SCHED_YIELD)
+      SET(CMAKE_THREAD_LIBS_INIT "${CMAKE_THREAD_LIBS_INIT} -lrt")
+    ENDIF(HAVE_SCHED_YIELD)
+  ENDIF(NOT HAVE_SCHED_YIELD)
+  IF(HAVE_SCHED_YIELD)
+    ADD_DEFINITIONS(-DHAVE_SCHED_YIELD)
+  ENDIF(HAVE_SCHED_YIELD)
+ENDIF(HAVE_PTHREAD_YIELD)
+
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  # need to have that for pthread_setaffinity_np on linux
+  ADD_DEFINITIONS(-D_GNU_SOURCE)
+  SET(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+CHECK_FUNCTION_EXISTS(pthread_setconcurrency HAVE_PTHREAD_SETCONCURRENCY)
+IF(HAVE_PTHREAD_SETCONCURRENCY)
+  ADD_DEFINITIONS(-DHAVE_PTHREAD_SETCONCURRENCY)
+ENDIF(HAVE_PTHREAD_SETCONCURRENCY)
+
+CHECK_FUNCTION_EXISTS(pthread_getconcurrency HAVE_PTHREAD_GETCONCURRENCY)
+IF(HAVE_PTHREAD_GETCONCURRENCY)
+  ADD_DEFINITIONS(-DHAVE_PTHREAD_GETCONCURRENCY)
+ENDIF(HAVE_PTHREAD_GETCONCURRENCY)
+
+CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP)
+IF(HAVE_PTHREAD_SETAFFINITY_NP)
+  ADD_DEFINITIONS(-DHAVE_PTHREAD_SETAFFINITY_NP)
+ELSE(HAVE_PTHREAD_SETAFFINITY_NP)
+  CHECK_CXX_SOURCE_COMPILES("
+#include <sched.h>
+int main() {
+  cpu_set_t cpumask;
+  sched_setaffinity( 0, sizeof(cpumask), &cpumask );
+  return 0;
+}" HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+  IF(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+    ADD_DEFINITIONS(-DHAVE_THREE_PARAM_SCHED_SETAFFINITY)
+  ELSE(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+    CHECK_CXX_SOURCE_COMPILES("
+#include <sched.h>
+int main() {
+  cpu_set_t cpumask;
+  sched_setaffinity( 0, &cpumask );
+  return 0;
+}" HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+    IF(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+      ADD_DEFINITIONS(-DHAVE_TWO_PARAM_SCHED_SETAFFINITY)
+    ENDIF(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+  ENDIF(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+ENDIF(HAVE_PTHREAD_SETAFFINITY_NP)
+
+SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES_SAFE}")
-
-TARGET_LINK_LIBRARIES(${LIB_NAME}

OpenThreads/trunk/src/OpenThreads/pthreads/PThread.c++

@@ -29 +29 @@
-#include <sys/unistd.h>
-#endif
-
-
-
+
+
+
+
+
+
+
+
+
-#endif
-#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__MACH__)
@@ -117 +123 @@
-        if (pd->cpunum>=0)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -341 +345 @@
-int Thread::SetConcurrency(int concurrencyLevel) {
-
-__sgi) || defined (__sun
+HAVE_PTHREAD_SETCONCURRENCY
-    return pthread_setconcurrency(concurrencyLevel);
-#else
@@ -357 +361 @@
-int Thread::GetConcurrency() {
-
-__sgi) || defined (__sun
+HAVE_PTHREAD_GETCONCURRENCY
-    return pthread_getconcurrency();
-#else
@@ -533 +537 @@
-    return status;
-
-
-
-
+
+
-    if (pd->isRunning && Thread::CurrentThread()==this)
-    {
@@ -541 +544 @@
-        CPU_ZERO( &cpumask );
-        CPU_SET( pd->cpunum, &cpumask );
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
@@ -896 +900 @@
-int Thread::YieldCurrentThread()
-{
-
+
+
+
-    return sched_yield();
-
+
+
+
-}
-
@@ -919 +927 @@
-{
-#if defined(__linux__)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-}
@@ -949 +973 @@
-    else
-    {
-
-
+
-        cpu_set_t cpumask;
-        CPU_ZERO( &cpumask );
-        CPU_SET( cpunum, &cpumask );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-