Changeset 7360 in vbox

Timestamp:

Mar 7, 2008 1:23:19 PM (17 years ago)

Author:

vboxsync

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

28783

Message:

quick adaption of system-os2.cpp into mp-os2.cpp.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r3/os2/mp-os2.cpp (moved) (moved from trunk/src/VBox/Runtime/r3/os2/RTMpGetCount-os2.cpp ) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -346 +346 @@
         generic/uuid-generic.cpp \
         os2/RTErrConvertFromOS2.cpp \
+        r3/os2/filelock-os2.cpp \
+        r3/os2/mp-os2.cpp \
         r3/os2/sched-os2.cpp \
         r3/os2/sems-os2.cpp \
@@ -351 +353 @@
         r3/os2/thread-os2.cpp \
         r3/os2/time-os2.cpp \
-        r3/os2/filelock-os2.cpp \
         r3/posix/alloc-posix.cpp \
         r3/posix/dir-posix.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * innotek Portable Runtime - System, OS/2.
+ * innotek Portable Runtime - Multiprocessor, OS/2.
  */
 
@@ -34 +34 @@
 #undef RT_MAX
 
-#include <iprt/system.h>
+#include <iprt/mp.h>
+#include <iprt/cpuset.h>
 #include <iprt/assert.h>
 
+/** @todo RTMpCpuId() */
 
-RTDECL(unsigned) RTSystemProcessorGetCount(void)
+RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
+{
+    return idCpu < RTCPUSET_MAX_CPUS ? idCpu : -1;
+}
+
+
+RTDECL(RTCPUID) RTMpCpuIdFromSetIndex(int iCpu)
+{
+    return (unsigned)iCpu < RTCPUSET_MAX_CPUS ? iCpu : NIL_RTCPUID;
+}
+
+
+RTDECL(RTCPUID) RTMpGetMaxCpuId(void)
+{
+    return RTCPUSET_MAX_CPUS;
+}
+
+
+RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
+{
+    RTCPUSET Set;
+    return RTCpuSetIsMember(RTMpGetOnlineSet(&Set), idCpu);
+}
+
+
+RTDECL(bool) RTMpDoesCpuExist(RTCPUID idCpu)
+{
+    RTCPUSET Set;
+    return RTCpuSetIsMember(RTMpGetSet(&Set), idCpu);
+}
+
+
+RTDECL(PRTCPUSET) RTMpGetSet(PRTCPUSET pSet)
+{
+    RTCPUID idCpu = RTMpGetCount();
+    RTCpuSetEmpty(pSet);
+    while (idCpu-- > 0)
+        RTCpuSetAdd(pSet, idCpu);
+    return pSet;
+}
+
+
+RTDECL(RTCPUID) RTMpGetCount(void)
 {
     ULONG cCpus = 1;
@@ -48 +92 @@
 
 
-RTR3DECL(uint64_t) RTSystemProcessorGetActiveMask(void)
+RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet);
 {
     union
@@ -59 +103 @@
     if (rc)
         u.u64 = 1;
-    return u.u64;
+    return RTCpuSetFromU64(pSet, u.u64);
 }
 
+
+RTDECL(RTCPUID) RTMpGetOnlineCount(void)
+{
+    RTCPUSET Set;
+    RTMpGetOnlineSet(&Set);
+    return RTCpuSetCount(&Set);
+}
+