Changeset 19057 in vbox for trunk/src/VBox/Runtime/r0drv/freebsd

Timestamp:

Apr 21, 2009 10:54:07 AM (16 years ago)

Author:

vboxsync

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

46184

Message:

IPRT/mp-r0drv-freebsd.c: Fixed a couple of issues. (hope it still works)

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c (modified) (9 diffs)

trunk/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c

@@ -50 +50 @@
 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu)
 {
-    return (int)idCpu < mp_ncpus ? (int)idCpu : -1;
+    return idCpu <= mp_maxid ? (int)idCpu : -1;
 }
 
@@ -56 +56 @@
 RTDECL(RTCPUID) RTMpCpuIdFromSetIndex(int iCpu)
 {
-    return iCpu < mp_ncpus ? (RTCPUID)iCpu : NIL_RTCPUID;
-}
+    return (unsigned)iCpu <= mp_maxid ? (RTCPUID)iCpu : NIL_RTCPUID;
+}
+
 
 RTDECL(RTCPUID) RTMpGetMaxCpuId(void)
 {
-    return mp_ncpus;
-}
+    return mp_maxid;
+}
+
 
 RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
 {
-    if (RT_UNLIKELY((int)idCpu > mp_ncpus))
-        return false;
-    else
-        return true;
-}
+    return idCpu <= mp_maxid;
+}
+
 
 RTDECL(PRTCPUSET) RTMpGetSet(PRTCPUSET pSet)
@@ -89 +89 @@
 RTDECL(RTCPUID) RTMpGetCount(void)
 {
-    return mp_ncpus;
+    return mp_maxid + 1;
 }
 
@@ -95 +95 @@
 RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
 {
-    if (RT_UNLIKELY((int)idCpu > mp_ncpus))
-        return false;
-
-    return CPU_ABSENT(idCpu) ? false : true;
-}
+    return idCpu <= mp_maxid
+        && !CPU_ABSENT(idCpu);
+}
+
 
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
@@ -121 +120 @@
     return mp_ncpus;
 }
+
 
 /**
@@ -165 +165 @@
 RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-    int rc;
-    RTMPARGS Args;
-    Args.pfnWorker = pfnWorker;
-    Args.pvUser1 = pvUser1;
-    Args.pvUser2 = pvUser2;
-    Args.idCpu = NIL_RTCPUID;
-    Args.cHits = 0;
-    smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
+    /* Will panic if no rendezvouing cpus, so check up front. */
+    if (RTMpGetOnlineCount() > 1)
+    {
+#if  __FreeBSD_version >= 700000
+        cpumask_t   Mask = ~(cpumask_t)curcpu;
+#endif
+        RTMPARGS    Args;
+
+        Args.pfnWorker = pfnWorker;
+        Args.pvUser1 = pvUser1;
+        Args.pvUser2 = pvUser2;
+        Args.idCpu = RTMpCpuId();
+        Args.cHits = 0;
+#if __FreeBSD_version >= 700000
+        smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
+#else
+        smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
+#endif
+    }
     return VINF_SUCCESS;
 }
@@ -185 +196 @@
 static void rtmpOnSpecificFreeBSDWrapper(void *pvArg)
 {
-    PRTMPARGS pArgs = (PRTMPARGS)pvArg;
-    RTCPUID idCpu = curcpu;
+    PRTMPARGS   pArgs = (PRTMPARGS)pvArg;
+    RTCPUID     idCpu = curcpu;
     if (pArgs->idCpu == idCpu)
     {
@@ -197 +208 @@
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-    int rc;
-    RTMPARGS Args;
+#if  __FreeBSD_version >= 700000
+    cpumask_t   Mask = 1 << idCpu;
+#endif
+    RTMPARGS    Args;
+
+    /* Will panic if no rendezvouing cpus, so make sure the cpu is online. */
+    if (!RTMpIsCpuOnline(idCpu))
+        return VERR_CPU_NOT_FOUND;
+
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;
@@ -204 +222 @@
     Args.idCpu = idCpu;
     Args.cHits = 0;
+#if __FreeBSD_version >= 700000
+    Mask = (cpumask_t)1 << idCpu;
+    smp_rendezvous_smp(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
+#else
     smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
+#endif
     return Args.cHits == 1
          ? VINF_SUCCESS