Updating to 0.4.3 SDK0.4.3-official

1 files changed, 109 insertions, 5 deletions

diff --git a/LibOVR/Src/Kernel/OVR_ThreadsPthread.cpp b/LibOVR/Src/Kernel/OVR_ThreadsPthread.cpp
index f375ddd..149f202 100644
--- a/LibOVR/Src/Kernel/OVR_ThreadsPthread.cpp
+++ b/LibOVR/Src/Kernel/OVR_ThreadsPthread.cpp
@@ -5,16 +5,16 @@ Content     :
 Created     :   
 Notes       : 
 
-Copyright   :   Copyright 2014 Oculus VR, Inc. All Rights reserved.
+Copyright   :   Copyright 2014 Oculus VR, LLC All Rights reserved.
 
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); 
+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License"); 
 you may not use the Oculus VR Rift SDK except in compliance with the License, 
 which is provided at the time of installation or download, or which 
 otherwise accompanies this software in either electronic or hard copy form.
 
 You may obtain a copy of the License at
 
-http://www.oculusvr.com/licenses/LICENSE-3.1 
+http://www.oculusvr.com/licenses/LICENSE-3.2 
 
 Unless required by applicable law or agreed to in writing, the Oculus VR SDK 
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,11 +33,21 @@ limitations under the License.
 #include "OVR_Log.h"
 
 #include <pthread.h>
+#include <sched.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <errno.h>
 
+#if defined(OVR_OS_MAC) || defined(OVR_OS_BSD)
+    #include <sys/sysctl.h>
+    #include <sys/param.h>
+    #if !defined(OVR_OS_MAC)
+        #include <pthread_np.h>
+    #endif
+#endif
+    
+
 
 namespace OVR {
 
@@ -704,12 +714,88 @@ pthread_attr_t Thread::Attr;
 
 /* static */
 int Thread::GetOSPriority(ThreadPriority p)
-//static inline int MapToSystemPrority(Thread::ThreadPriority p)
 {
     OVR_UNUSED(p);
     return -1;
 }
 
+/* static */
+Thread::ThreadPriority Thread::GetOVRPriority(int osPriority)
+{
+    #if defined(OVR_OS_LINUX)
+        return (ThreadPriority)(Thread::NormalPriority - osPriority); // This works for both SCHED_OTHER, SCHED_RR, and SCHED_FIFO.
+    #else
+        // Apple priorities are such that the min is a value less than the max.
+        static int minPriority = sched_get_priority_min(SCHED_FIFO); // We don't have a means to pass a policy type to this function.
+        static int maxPriority = sched_get_priority_max(SCHED_FIFO);
+
+        return (ThreadPriority)(Thread::NormalPriority - (osPriority - ((minPriority + maxPriority) / 2)));
+    #endif
+}
+
+
+Thread::ThreadPriority Thread::GetPriority()
+{
+    int         policy;
+    sched_param param;
+
+    int result = pthread_getschedparam(ThreadHandle, &policy, &param);
+
+    if(result == 0)
+    {
+        #if !defined(OVR_OS_LINUX)
+            if(policy == SCHED_OTHER)
+            {
+                return Thread::NormalPriority; //SCHED_OTHER allows only normal priority on BSD-style Unix and Mac OS X.
+            }
+        #endif
+
+        return GetOVRPriority(param.sched_priority);
+    }
+
+    return Thread::NormalPriority;
+}
+
+/* static */
+Thread::ThreadPriority Thread::GetCurrentPriority()
+{
+    int         policy;
+    sched_param param;
+    pthread_t   currentThreadId = pthread_self();
+
+    int result = pthread_getschedparam(currentThreadId, &policy, &param);
+
+    if(result == 0)
+    {
+        #if !defined(OVR_OS_LINUX)
+            if(policy == SCHED_OTHER)
+            {
+                return Thread::NormalPriority; //SCHED_OTHER allows only normal priority on BSD-style Unix and Mac OS X.
+            }
+        #endif
+
+        return GetOVRPriority(param.sched_priority);
+    }
+
+    return Thread::NormalPriority;
+}
+
+
+bool Thread::SetPriority(ThreadPriority)
+{
+    // We currently fail. To do: add code to support this via pthread_getschedparam/pthread_attr_setschedparam
+    // This won't work unless using SCHED_FIFO or SCHED_RR anyway, which require root privileges.
+    return false;
+}
+
+/* static */
+bool Thread::SetCurrentPriority(ThreadPriority)
+{
+    // We currently fail. To do: add code to support this via pthread_getschedparam/pthread_attr_setschedparam
+    // This won't work unless using SCHED_FIFO or SCHED_RR anyway, which require root privileges.
+    return false;
+}
+
 bool    Thread::Start(ThreadState initialState)
 {
     if (initialState == NotRunning)
@@ -821,7 +907,25 @@ bool    Thread::MSleep(unsigned msecs)
 /* static */
 int     Thread::GetCPUCount()
 {
-    return 1;
+    #if defined(OVR_OS_MAC) || defined(OVR_OS_BSD)
+        // http://developer.apple.com/mac/library/documentation/Darwin/Reference/ManPages/man3/sysctlbyname.3.html
+        int    cpuCount = 0;
+        size_t len = sizeof(cpuCount);
+
+        if(sysctlbyname("hw.logicalcpu", &cpuCount, &len, NULL, 0) != 0) 
+            cpuCount = 1;
+
+        return cpuCount;
+
+    #else // Linux, Android
+
+        // Alternative: read /proc/cpuinfo
+        #ifdef _SC_NPROCESSORS_ONLN
+            return (int)sysconf(_SC_NPROCESSORS_ONLN);
+        #else
+            return 1;
+        #endif
+    #endif
 }