Changeset 46616 in vbox

Timestamp:

Jun 18, 2013 10:48:34 AM (11 years ago)

Author:

vboxsync

Message:

Runtime/r3/mp-win, Runtime/Makefile: Support for getting physical core count for Windows.

Location:

trunk/src/VBox

Files:

• Runtime/Makefile.kmk (modified) (1 diff)
• Runtime/r3/win/mp-win.cpp (modified) (1 diff)
• VMM/VMMR3/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -565 +565 @@
         generic/RTDirSetTimes-generic.cpp \
         generic/RTFileExists-generic.cpp \
-        generic/RTMpGetCoreCount-generic.cpp \
         generic/RTMpGetCurFrequency-generic.cpp \
         generic/RTMpGetMaxFrequency-generic.cpp \

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

@@ -91 +91 @@
 }
 
+RTDECL(RTCPUID) RTMpGetCoreCount(void)
+{
+    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION pSysInfo = NULL;
+    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION pSysInfoTmp = NULL;
+    DWORD sysProcInfoLen = 0;
+    DWORD offset = 0;
+    DWORD coreCount = 0;
+    BOOL rc;
+    BOOL (WINAPI *pfnGetLogicalProcInfo)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
+
+    pfnGetLogicalProcInfo = (BOOL (WINAPI *)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD))
+                             GetProcAddress(GetModuleHandle("KERNEL32.DLL"), "GetLogicalProcessorInformation");
+    /* 0 represent error condition. Can't return VERR* error codes as caller expects a unsigned value of core count.*/
+    if (!pfnGetLogicalProcInfo)
+        return 0;
+
+    rc = pfnGetLogicalProcInfo(pSysInfo, &sysProcInfoLen);
+    if (rc == FALSE)
+    {
+        if (GetLastError() ==  ERROR_INSUFFICIENT_BUFFER)
+        {
+            RTMemFree(pSysInfo);
+            pSysInfo = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION)RTMemAlloc(sysProcInfoLen);
+            if (!pSysInfo)
+                 return 0;
+        }
+        else
+            return 0;
+    }
+
+    rc = pfnGetLogicalProcInfo(pSysInfo, &sysProcInfoLen);
+    if (rc == FALSE)
+    {
+        RTMemFree(pSysInfo);
+        return 0;
+    }
+    pSysInfoTmp = pSysInfo;
+    while (offset + sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION) <= sysProcInfoLen)
+    {
+        switch (pSysInfoTmp->Relationship)
+        {
+            case RelationProcessorCore:
+                coreCount++;
+            break;
+            case RelationCache:
+            case RelationNumaNode:
+            case RelationProcessorPackage:
+            default:
+            ;
+        }
+        offset += sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION);
+        pSysInfoTmp++;
+    }
+    RTMemFree(pSysInfo);
+    return coreCount;
+}
 
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -4280 +4280 @@
                 (unsigned)RTMpGetPresentCount(), (unsigned)RTMpGetCount(), (unsigned)RTMpGetOnlineCount(),
                 RTCpuSetToU64(RTMpGetOnlineSet(&OnlineSet)) ));
+    LogRel(("Physical core count = %u\n", (unsigned)RTMpGetCoreCount() ));
     LogRel(("************************* CPUID dump ************************\n"));
     DBGFR3Info(pVM->pUVM, "cpuid", "verbose", DBGFR3InfoLogRelHlp());