Changeset 14338 in vbox for trunk

Timestamp:

Nov 18, 2008 11:38:52 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: Basic implementation of the MP API for ring-0 Darwin.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r0drv/darwin/mp-r0drv-darwin.cpp (modified) (5 diffs)
• r0drv/darwin/the-darwin-kernel.h (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1079 +1079 @@
         darwin/RTErrConvertFromDarwinKern.cpp \
         generic/RTAssertShouldPanic-generic.cpp \
-        generic/RTMpCpuId-generic.cpp \
-        generic/RTMpCpuIdFromSetIndex-generic.cpp \
-        generic/RTMpCpuIdToSetIndex-generic.cpp \
-        generic/RTMpIsCpuPossible-generic.cpp \
-        generic/RTMpGetCount-generic.cpp \
-        generic/RTMpGetMaxCpuId-generic.cpp \
-        generic/RTMpGetOnlineCount-generic.cpp \
-        generic/RTMpGetOnlineSet-generic.cpp \
-        generic/RTMpGetSet-generic.cpp \
-        generic/RTMpIsCpuOnline-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
         generic/timer-generic.cpp \
-        r0drv/generic/RTMpOn-r0drv-generic.cpp \
         r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
         r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
@@ -1101 +1090 @@
         r0drv/darwin/initterm-r0drv-darwin.cpp \
         r0drv/darwin/memobj-r0drv-darwin.cpp \
+        r0drv/darwin/mp-r0drv-darwin.cpp \
         r0drv/darwin/process-r0drv-darwin.cpp \
         r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp \

trunk/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp

@@ -40 +40 @@
 #include "r0drv/mp-r0drv.h"
 
+#define MY_DARWIN_MAX_CPUS      (0xf + 1) /* see MAX_CPUS */
+
+
+DECLINLINE(int) rtMpDarwinMaxCpus(void)
+{
+    return ml_get_max_cpus();
+}
+
 
 RTDECL(RTCPUID) RTMpCpuId(void)
@@ -47 +55 @@
 
 
-/** 
- * Wrapper between the native darwin per-cpu callback and PFNRTWORKER 
+RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
+{
+    return idCpu < MY_DARWIN_MAX_CPUS ? (int)idCpu : -1;
+}
+
+
+RTDECL(RTCPUID) RTMpCpuIdFromSetIndex(int iCpu)
+{
+    return (unsigned)iCpu < MY_DARWIN_MAX_CPUS ? (RTCPUID)iCpu : NIL_RTCPUID;
+}
+
+
+RTDECL(RTCPUID) RTMpGetMaxCpuId(void)
+{
+    return rtMpDarwinMaxCpus() - 1;
+}
+
+
+RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
+{
+    return idCpu < MY_DARWIN_MAX_CPUS
+        && idCpu < (RTCPUID)rtMpDarwinMaxCpus();
+}
+
+
+RTDECL(PRTCPUSET) RTMpGetSet(PRTCPUSET pSet)
+{
+
+}
+
+
+RTDECL(RTCPUID) RTMpGetCount(void)
+{
+    return rtMpDarwinMaxCpus();
+}
+
+
+RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
+{
+    /** @todo darwin R0 MP */
+    return RTMpGetSet(pSet);
+}
+
+
+RTDECL(RTCPUID) RTMpGetOnlineCount(void)
+{
+    /** @todo darwin R0 MP */
+    return RTMpGetCount();
+}
+
+
+RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
+{
+    /** @todo darwin R0 MP */
+    return RTMpIsCpuPossible(idCpu);
+}
+
+
+RTDECL(PRTCPUSET) RTMpGetPresentSet(PRTCPUSET pSet)
+{
+    return RTMpGetSet(pSet);
+}
+
+
+RTDECL(RTCPUID) RTMpGetPresentCount(void)
+{
+    return RTMpGetCount();
+}
+
+
+RTDECL(bool) RTMpIsCpuPresent(RTCPUID idCpu)
+{
+    return RTMpIsCpuPossible(idCpu);
+}
+
+
+RTDECL(uint32_t) RTMpGetCurFrequency(RTCPUID idCpu)
+{
+    /** @todo darwin R0 MP (rainy day) */
+    return 0;
+}
+
+
+RTDECL(uint32_t) RTMpGetMaxFrequency(RTCPUID idCpu)
+{
+    /** @todo darwin R0 MP (rainy day) */
+    return 0;
+}
+
+
+/**
+ * Wrapper between the native darwin per-cpu callback and PFNRTWORKER
  * for the RTMpOnAll API.
- * 
+ *
  * @param   pvArg   Pointer to the RTMPARGS package.
  */
@@ -68 +166 @@
     Args.idCpu = NIL_RTCPUID;
     Args.cHits = 0;
-    mp_rendezvous(NULL, rtmpOnAllDarwinWrapper, NULL, &Args);
+    mp_rendezvous_no_intrs(rtmpOnAllDarwinWrapper, &Args);
     return VINF_SUCCESS;
 }
 
 
-/** 
- * Wrapper between the native darwin per-cpu callback and PFNRTWORKER 
+/**
+ * Wrapper between the native darwin per-cpu callback and PFNRTWORKER
  * for the RTMpOnOthers API.
- * 
+ *
  * @param   pvArg   Pointer to the RTMPARGS package.
  */
@@ -97 +195 @@
     Args.idCpu = NIL_RTCPUID;
     Args.cHits = 0;
-    mp_rendezvous(NULL, rtmpOnOthersDarwinWrapper, NULL, &Args);
+    mp_rendezvous_no_intrs(rtmpOnOthersDarwinWrapper, &Args);
     return VINF_SUCCESS;
 }
 
 
-/** 
- * Wrapper between the native darwin per-cpu callback and PFNRTWORKER 
+/**
+ * Wrapper between the native darwin per-cpu callback and PFNRTWORKER
  * for the RTMpOnSpecific API.
- * 
+ *
  * @param   pvArg   Pointer to the RTMPARGS package.
  */
@@ -129 +227 @@
     Args.idCpu = idCpu;
     Args.cHits = 0;
-    mp_rendezvous(NULL, rtmpOnSpecificDarwinWrapper, NULL, &Args);
-    return Args.cHits == 1 
-         ? VINF_SUCCESS 
+    mp_rendezvous_no_intrs(rtmpOnSpecificDarwinWrapper, &Args);
+    return Args.cHits == 1
+         ? VINF_SUCCESS
          : VERR_CPU_NOT_FOUND;
 }

trunk/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h

@@ -59 +59 @@
 #include <kern/sched_prim.h>
 #include <kern/locks.h>
+#include <i386/mp_events.h>
 #include <libkern/libkern.h>
 #include <mach/thread_act.h>
@@ -96 +97 @@
 /* mach/i386/thread_act.h */
 extern kern_return_t thread_terminate(thread_t);
+
+/* osfmk/i386/mp.h */
+extern void mp_rendezvous(void (*)(void *), void (*)(void *), void (*)(void *), void *);
+extern void mp_rendezvous_no_intrs(void (*)(void *), void *);
+
+/* osfmk/i386/cpu_number.h */
+extern int cpu_number(void);
+
+/* i386/machine_routines.h */
+extern int ml_get_max_cpus(void);
+
 __END_DECLS