Changeset 22347 in vbox for trunk/src

Timestamp:

Aug 19, 2009 2:02:05 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/mpnotification: Cache CPU set to avoid recursive calls to vbi_cpu_online.

Location:

trunk/src/VBox/Runtime/r0drv/solaris/vbi

Files:

• internal-r0drv-solaris.h (added)
• mp-r0drv-solaris.c (modified) (6 diffs)
• mpnotification-r0drv-solaris.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c

@@ -38 +38 @@
 
 #include <iprt/asm.h>
-#include <iprt/cpuset.h>
 #include <iprt/err.h>
+#include "internal-r0drv-solaris.h"
 #include "r0drv/mp-r0drv.h"
 
@@ -76 +76 @@
 RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
 {
+    /*
+     * We cannot query CPU status recursively, check cpu member from cached set.
+     */
+    if (idCpu >= vbi_cpu_count())
+        return false;
+
+    return RTCpuSetIsMember(&g_rtMpSolarisCpuSet, idCpu);
+
+#if 0
     return idCpu < vbi_cpu_count() && vbi_cpu_online(idCpu);
+#endif
 }
 
@@ -110 +120 @@
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
 {
+    /*
+     * We cannot query CPU status recursively, return the cached set.
+     */
+    *pSet = g_rtMpSolarisCpuSet;
+    return pSet;
+
+#if 0
     RTCPUID idCpu;
 
@@ -121 +138 @@
 
     return pSet;
+#endif
 }
 
@@ -126 +144 @@
 RTDECL(RTCPUID) RTMpGetOnlineCount(void)
 {
+    RTCPUSET Set;
+    RTMpGetOnlineSet(&Set);
+    return RTCpuSetCount(&Set);
+
+#if 0
     int c;
     int cnt = 0;
@@ -135 +158 @@
     }
     return cnt;
+#endif
 }
 

trunk/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c

@@ -38 +38 @@
 #include <iprt/mp.h>
 #include "r0drv/mp-r0drv.h"
+#include "internal-r0drv-solaris.h"
 
 
@@ -45 +46 @@
 static vbi_cpu_watch_t *g_hVbiCpuWatch = NULL;
 
+RTCPUSET g_rtMpSolarisCpuSet;
 
 static void rtMpNotificationSolarisCallback(void *pvUser, int iCpu, int online)
@@ -52 +54 @@
     /* ASSUMES iCpu == RTCPUID */
     if (online)
+    {
+        RTCpuSetAdd(&g_rtMpSolarisCpuSet, iCpu);
         rtMpNotificationDoCallbacks(RTMPEVENT_ONLINE, iCpu);
+    }
     else
+    {
+        RTCpuSetDel(&g_rtMpSolarisCpuSet, iCpu);
         rtMpNotificationDoCallbacks(RTMPEVENT_OFFLINE, iCpu);
+    }
 }
 
@@ -64 +72 @@
     if (g_hVbiCpuWatch != NULL)
         return VERR_WRONG_ORDER;
+
+    /*
+     * Cache the list of online CPUs.
+     */
+    RTCpuSetEmpty(&g_rtMpSolarisCpuSet);
+
     g_hVbiCpuWatch = vbi_watch_cpus(rtMpNotificationSolarisCallback, NULL, 0);
+
+    RTCPUID idCpu = RTMpGetMaxCpuId();
+    do
+    {
+        /** @todo vbi_cpu_online() should do boundary check "idCpu" rather than hang the system. */
+        if (   RTMpIsCpuPossible(idCpu)
+            && vbi_cpu_online(idCpu))
+        {
+            RTCpuSetAdd(&g_rtMpSolarisCpuSet, idCpu);
+        }
+    } while (idCpu-- > 0);
+
     return VINF_SUCCESS;
 }