Changeset 37154 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 19, 2011 12:54:32 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71834

Message:

RTThread[SG]etAffinity cleanup

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (8 diffs)
• generic/RTThreadGetAffinity-stub-generic.cpp (added)
• generic/RTThreadSetAffinity-stub-generic.cpp (added)
• generic/RTThreadSetAffinityToCpu-generic.cpp (added)
• r3/os2/thread-os2.cpp (modified) (3 diffs)
• r3/posix/thread-posix.cpp (modified) (1 diff)
• r3/solaris/thread-affinity-solaris.cpp (added)
• r3/win/thread-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -527 +527 @@
         generic/RTSemMutexRequest-generic.cpp \
         generic/RTSemMutexRequestDebug-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/mppresent-generic.cpp \
         generic/semrw-$(if-expr defined(VBOX_WITH_LOCKLESS_SEMRW),lockless-,)generic.cpp \
@@ -581 +582 @@
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
+        generic/RTThreadGetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/RTUuidCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -660 +664 @@
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/RTUuidCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -720 +725 @@
         generic/RTLogWriteDebugger-generic.cpp \
         generic/RTProcDaemonize-generic.cpp \
+        generic/RTThreadGetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
@@ -781 +789 @@
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
         generic/RTSystemQueryDmiString-generic.cpp \
+        generic/RTThreadGetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
@@ -842 +853 @@
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
@@ -888 +900 @@
         r3/posix/utf8-posix.cpp \
         r3/solaris/mp-solaris.cpp \
-        r3/solaris/rtProcInitExePath-solaris.cpp
+        r3/solaris/rtProcInitExePath-solaris.cpp \
+        r3/solaris/thread-affinity-solaris.cpp
 RuntimeR3_SOURCES.solaris.amd64 = \
         r3/solaris/coredumper-solaris.cpp \
@@ -925 +938 @@
         generic/RTSystemQueryOSInfo-generic.cpp \
         generic/RTSystemQueryDmiString-generic.cpp \
+        generic/RTThreadGetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinity-stub-generic.cpp \
+        generic/RTThreadSetAffinityToCpu-generic.cpp \
         generic/RTTimeLocalNow-generic.cpp \
         generic/RTUuidCreate-generic.cpp \

trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp

@@ -199 +199 @@
 
 
-RTDECL(uint64_t) RTThreadGetAffinity(void)
+RTR3DECL(int) RTThreadGetAffinity(PRTCPUSET pCpuSet)
+{
+    return VINF_SUCCESS;
+}
+
+RTR3DECL(int) RTThreadGetAffinity(PRTCPUSET pCpuSet)
 {
     union
@@ -207 +212 @@
     } u;
 
-    int rc = DosQueryThreadAffinity(AFNTY_THREAD, &u.mpaff);
-    if (rc)
-        u.u64 = 1;
-    return u.u64;
-}
-
-
-RTDECL(int) RTThreadSetAffinity(uint64_t u64Mask)
+    APIRET rc = DosQueryThreadAffinity(AFNTY_THREAD, &u.mpaff);
+    if (!rc)
+    {
+        RTCpuSetFromU64(pCpuSet, u.u64);
+        return VINF_SUCCESS;
+    }
+    return RTErrConvertFromOS2(rc);
+}
+
+
+RTR3DECL(int) RTThreadSetAffinity(PCRTCPUSET pCpuSet)
 {
     union
@@ -221 +229 @@
         MPAFFINITY mpaff;
     } u;
-    u.u64 = u64Mask;
+    u.u64 = pCpuSet ? RTCpuSetToU64(pCpuSet) : UINT64_MAX;
     int rc = DosSetThreadAffinity(&u.mpaff);
     if (!rc)

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -384 +384 @@
 
 
-RTR3DECL(uint64_t) RTThreadGetAffinity(void)
-{
-    return 1;
-}
-
-
-RTR3DECL(int) RTThreadSetAffinity(uint64_t u64Mask)
-{
-    if (u64Mask != 1)
-        return VERR_INVALID_PARAMETER;
-    return VINF_SUCCESS;
-}
-
-
 #ifdef RTTHREAD_POSIX_WITH_POKE
 RTDECL(int) RTThreadPoke(RTTHREAD hThread)

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -281 +281 @@
 
 
-RTR3DECL(int) RTThreadSetAffinity(uint64_t u64Mask)
-{
-    Assert((DWORD_PTR)u64Mask == u64Mask || u64Mask == ~(uint64_t)0);
-    DWORD_PTR dwRet = SetThreadAffinityMask(GetCurrentThread(), (DWORD_PTR)u64Mask);
+RTR3DECL(int) RTThreadSetAffinity(PCRTCPUSET pCpuSet)
+{
+    DWORD_PTR fNewMask = pCpuSet ? RTCpuSetToU64(pCpuSet) : ~(DWORD_PTR)0;
+    DWORD_PTR dwRet = SetThreadAffinityMask(GetCurrentThread(), fNewMask);
     if (dwRet)
         return VINF_SUCCESS;
@@ -294 +294 @@
 
 
-RTR3DECL(uint64_t) RTThreadGetAffinity(void)
+RTR3DECL(int) RTThreadGetAffinity(PRTCPUSET pCpuSet)
 {
     /*
@@ -309 +309 @@
             DWORD_PTR dwSet = SetThreadAffinityMask(hThread, dwRet);
             Assert(dwSet == dwProcAff); NOREF(dwRet);
-            return dwRet;
+
+            RTCpuSetFromU64(pCpuSet, (uint64_t)dwSet);
+            return VINF_SUCCESS;
         }
     }