Changeset 5417

Timestamp:

08/10/06 17:50:56

Author:

robert

Message:

Added OpenThreads?::GetNumberOfProcessors().

Added better support for Linux processor affinity. Note, there happens to be to
API's out in the wild for sched_setaffinity, and two param one, and a three param one. To
arbitrate between the two ) have added a check against the define COMPILE_USING_TWO_PARAM_sched_setaffinity
in in the source. This can be selected on the command line via:

make COMPILE_USING_TWO_PARAM_sched_setaffinity=yes

Files:

• OpenThreads/trunk/include/OpenThreads/Thread (modified) (3 diffs)
• OpenThreads/trunk/pthread_src/GNUmakefile (modified) (1 diff)
• OpenThreads/trunk/pthread_src/PThread.c++ (modified) (7 diffs)
• OpenThreads/trunk/pthread_src/PThreadPrivateData.h (modified) (1 diff)
• OpenThreads/trunk/sproc_src/SprocThread.c++ (modified) (2 diffs)
• OpenThreads/trunk/win32_src/Win32Thread.cpp (modified) (2 diffs)

OpenThreads/trunk/include/OpenThreads/Thread

@@ -30 +30 @@
-
-namespace OpenThreads {
+
+/**
+ *  Get the number of processors.
+ *
+ *  Note, systems where no support exists for querrying the number of processors, 1 is returned. 
+ *
+ */
+extern OPENTHREAD_EXPORT_DIRECTIVE int GetNumberOfProcessors();
+
-
-/**
@@ -130 +139 @@
-     */
-    static ThreadPriority GetMasterPriority() {return s_masterThreadPriority;};
+
-
-    /**
@@ -360 +370 @@
-     */
-    void * _prvData;
-
+
-    /**
-     *  Master thread's priority, set by Thread::Init.

OpenThreads/trunk/pthread_src/GNUmakefile

@@ -41 +41 @@
-LIB = $(LIB_PREFIX)$(TARGET_BASENAME)
-
-
+
+
+
-include $(TOPDIR)/Make/makerules

OpenThreads/trunk/pthread_src/PThread.c++

@@ -35 +35 @@
-#endif
-
+#if defined (__linux__)
+    #include <sched.h>
+#endif
+
-#include <OpenThreads/Thread>
-#include "PThreadPrivateData.h"
@@ -110 +114 @@
-            static_cast<PThreadPrivateData *>(thread->_prvData);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        ThreadCleanupStruct tcs;
@@ -355 +376 @@
-    pd->threadPriority = Thread::THREAD_PRIORITY_DEFAULT;
-    pd->threadPolicy = Thread::THREAD_SCHEDULE_DEFAULT;
+    pd->cpunum = -1;
-
-    _prvData = static_cast<void *>(pd);
@@ -482 +504 @@
-    PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);
-    pd->cpunum = cpunum;
+    if (pd->cpunum<0) return -1;
+    
-#ifdef __sgi
+
-    int status;
-    pthread_attr_t thread_attr;
@@ -493 +518 @@
-    status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP );
-    return status;
+
+#elif defined (__linux__) && defined(CPU_SET)
+
+  
+    if (pd->isRunning && Thread::CurrentThread()==this)
+    {
+        cpu_set_t cpumask;
+        CPU_ZERO( &cpumask );
+        CPU_SET( pd->cpunum, &cpumask );
+
+        #if defined(COMPILE_USING_TWO_PARAM_sched_setaffinity)
+            return sched_setaffinity( 0, &cpumask );
+        #else
+            return sched_setaffinity( 0, sizeof(cpumask), &cpumask );
+        #endif
+    }
+
+    return -1;
-#else
-    return -1;
@@ -828 +871 @@
-// Use: protected
-//
-
+
+
-
-    return sched_yield();
@@ -842 +886 @@
-    return ::usleep(microsec);
-}
+
+
+
+//-----------------------------------------------------------------------------
+//
+// Description:  Get the number of processors
+//
+int OpenThreads::GetNumberOfProcessors()
+{
+#if defined(__linux__)
+    return sysconf(_SC_NPROCESSORS_CONF);
+#else
+    return 1;
+#endif    
+}

OpenThreads/trunk/pthread_src/PThreadPrivateData.h

@@ -66 +66 @@
-    volatile int uniqueId;
-
-unsigned 
+
-
-    static int nextId;

OpenThreads/trunk/sproc_src/SprocThread.c++

@@ -350 +350 @@
-
-    _prvData = static_cast<void *>(pd);
-
-}
-
@@ -775 +774 @@
-
-}
+
+int Thread::setProcessorAffinity( unsigned int cpunum )
+{
+    return -1;
+}
+
+//-----------------------------------------------------------------------------
+//
+// Description:  Get the number of processors
+//
+int OpenThreads::GetNumberOfProcessors()
+{
+    return 1;
+}

OpenThreads/trunk/win32_src/Win32Thread.cpp

@@ -238 +238 @@
-
-    pd->stackSize = 0;
-
-    pd->isRunning = false;
-
-    pd->cancelMode = 0;
-
-    pd->uniqueId = 0;
-
-    pd->threadPriority = Thread::THREAD_PRIORITY_DEFAULT;
-
-    pd->threadPolicy = Thread::THREAD_SCHEDULE_DEFAULT;
-
-    pd->detached = false;
-
-    pd->cancelEvent.set(CreateEvent(NULL,TRUE,FALSE,NULL));
-
-    _prvData = static_cast<void *>(pd);
-
-}
-
@@ -641 +633 @@
-#endif
-}
+
+
+//-----------------------------------------------------------------------------
+//
+// Description:  Get the number of processors
+//
+int OpenThreads::GetNumberOfProcessors()
+{
+    return 1;
+}