Changeset 39303 in vbox

Timestamp:

Nov 15, 2011 10:55:12 AM (13 years ago)

Author:

vboxsync

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

74857

Message:

VMCPUSET changes.

Location:

trunk

Files:

• include/VBox/types.h (modified) (2 diffs)
• include/VBox/vmm/vmcpuset.h (added)
• src/VBox/Devices/PC/DevACPI.cpp (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/VMMInternal.h (modified) (1 diff)

trunk/include/VBox/types.h

@@ -118 +118 @@
 {
     /** The bitmap data.  */
-    uint32_t    au32Bitmap[256/32];
+    uint32_t    au32Bitmap[8 /*256/32*/];
 } VMCPUSET;
 /** Pointer to a Virtual CPU set. */
@@ -124 +124 @@
 /** Pointer to a const Virtual CPU set. */
 typedef VMCPUSET const *PCVMCPUSET;
-
-/** Tests if a valid CPU ID is present in the set.. */
-#define VMCPUSET_IS_PRESENT(pSet, idCpu)    ASMBitTest( &(pSet)->au32Bitmap, (idCpu))
-/** Adds a CPU to the set. */
-#define VMCPUSET_ADD(pSet, idCpu)           ASMBitSet(  &(pSet)->au32Bitmap, (idCpu))
-/** Deletes a CPU from the set. */
-#define VMCPUSET_DEL(pSet, idCpu)           ASMBitClear(&(pSet)->au32Bitmap, (idCpu))
-/** Empties the set. */
-#define VMCPUSET_EMPTY(pSet)                memset(&(pSet)->au32Bitmap[0], '\0', sizeof((pSet)->au32Bitmap))
-/** Filles the set. */
-#define VMCPUSET_FILL(pSet)                 memset(&(pSet)->au32Bitmap[0], 0xff, sizeof((pSet)->au32Bitmap))
-/** Filles the set. */
-#define VMCPUSET_IS_EQUAL(pSet1, pSet2)     (memcmp(&(pSet1)->au32Bitmap[0], &(pSet2)->au32Bitmap[0], sizeof((pSet1)->au32Bitmap)) == 0)
 
 

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -23 +23 @@
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/dbgftrace.h>
+#include <VBox/vmm/vmcpuset.h>
 #include <VBox/log.h>
 #include <VBox/param.h>

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1793 +1793 @@
 
             InsertConfigNode(pInst, "Config", &pCfg);
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE   /* not safe here yet. */
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE   /* not safe here yet. */ /** @todo Make PCNet ring-0 safe on 32-bit mac kernels! */
             if (pDev == pDevPCNet)
             {

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -24 +24 @@
 #include "VMMInternal.h"
 #include <VBox/vmm/vm.h>
-#include <VBox/vmm/vmm.h>
+#include <VBox/vmm/vmcpuset.h>
 #include <VBox/param.h>
 #include <iprt/thread.h>
 #include <iprt/mp.h>
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** User counter for the vmmInitFormatTypes function (pro forma). */
+static volatile uint32_t g_cFormatTypeUsers = 0;
+
+
+/**
+ * Helper that formats a decimal number in the range 0..9999.
+ *
+ * @returns The length of the formatted number.
+ * @param   pszBuf              Output buffer with sufficient space.
+ * @param   uNum                The number to format.
+ */
+static unsigned vmmFormatTypeShortNumber(char *pszBuf, uint32_t uNumber)
+{
+    unsigned  off = 0;
+    if (uNumber >= 10)
+    {
+        if (uNumber >= 100)
+        {
+            if (uNumber >= 1000)
+                pszBuf[off++] = ((uNumber / 1000) % 10) + '0';
+            pszBuf[off++] = ((uNumber / 100) % 10) + '0';
+        }
+        pszBuf[off++] = ((uNumber / 10) % 10) + '0';
+    }
+    pszBuf[off++] = (uNumber % 10) + '0';
+    pszBuf[off] = '\0';
+    return off;
+}
+
+
+/**
+ * @callback_method_impl{FNRTSTRFORMATTYPE, vmsetcpu}
+ */
+static DECLCALLBACK(size_t) vmmFormatTypeVmCpuSet(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                                                  const char *pszType, void const *pvValue,
+                                                  int cchWidth, int cchPrecision, unsigned fFlags,
+                                                  void *pvUser)
+{
+    PCVMCPUSET  pSet   = (PCVMCPUSET)pvValue;
+    uint32_t    cCpus  = 0;
+    uint32_t    iCpu   = RT_ELEMENTS(pSet->au32Bitmap) * 32;
+    while (iCpu--)
+        if (VMCPUSET_IS_PRESENT(pSet, iCpu))
+            cCpus++;
+
+    char szTmp[32];
+    AssertCompile(RT_ELEMENTS(pSet->au32Bitmap) * 32 < 999);
+    if (cCpus == 1)
+    {
+        iCpu = RT_ELEMENTS(pSet->au32Bitmap) * 32;
+        while (iCpu--)
+            if (VMCPUSET_IS_PRESENT(pSet, iCpu))
+            {
+                szTmp[0] = 'c';
+                szTmp[1] = 'p';
+                szTmp[2] = 'u';
+                return pfnOutput(pvArgOutput, szTmp, 3 + vmmFormatTypeShortNumber(&szTmp[3], iCpu));
+            }
+        cCpus = 0;
+    }
+    if (cCpus == 0)
+        return pfnOutput(pvArgOutput, "<empty>", sizeof("<empty>") - 1);
+    if (cCpus == RT_ELEMENTS(pSet->au32Bitmap) * 32)
+        return pfnOutput(pvArgOutput, "<full>", sizeof("<full>") - 1);
+
+    /*
+     * Print cpus that are present: {1,2,7,9 ... }
+     */
+    size_t cchRet = pfnOutput(pvArgOutput, "{", 1);
+
+    cCpus = 0;
+    iCpu  = 0;
+    while (iCpu < RT_ELEMENTS(pSet->au32Bitmap) * 32)
+    {
+        if (VMCPUSET_IS_PRESENT(pSet, iCpu))
+        {
+            /* Output the first cpu number. */
+            int off = 0;
+            if (cCpus != 0)
+                szTmp[off++] = ',';
+            off += vmmFormatTypeShortNumber(&szTmp[off], iCpu);
+
+            /* Check for sequence. */
+            uint32_t const iStart = ++iCpu;
+            while (   iCpu < RT_ELEMENTS(pSet->au32Bitmap) * 32
+                   && VMCPUSET_IS_PRESENT(pSet, iCpu))
+                iCpu++;
+            if (iCpu != iStart)
+            {
+                szTmp[off++] = '-';
+                off += vmmFormatTypeShortNumber(&szTmp[off], iCpu);
+            }
+
+            /* Terminate and output. */
+            szTmp[off] = '\0';
+            cchRet += pfnOutput(pvArgOutput, szTmp, off);
+        }
+        iCpu++;
+    }
+
+    cchRet += pfnOutput(pvArgOutput, "}", 1);
+    NOREF(pvUser);
+    return cchRet;
+}
+
+
+/**
+ * Registers the VMM wide format types.
+ *
+ * Called by VMMR3Init, VMMR0Init and VMMRCInit.
+ */
+int vmmInitFormatTypes(void)
+{
+    int rc = VINF_SUCCESS;
+    if (ASMAtomicIncU32(&g_cFormatTypeUsers) == 1)
+        rc = RTStrFormatTypeRegister("vmcpuset", vmmFormatTypeVmCpuSet, NULL);
+    return rc;
+}
+
+
+#ifndef IN_RC
+/**
+ * Counterpart to vmmInitFormatTypes, called by VMMR3Term and VMMR0Term.
+ */
+void vmmTermFormatTypes(void)
+{
+    if (ASMAtomicDecU32(&g_cFormatTypeUsers) == 0)
+        RTStrFormatTypeDeregister("vmcpuset");
+}
+#endif
 
 
@@ -203 +338 @@
     return pVM->vmm.s.enmSwitcher;
 }
+

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -56 +56 @@
 #include <VBox/vmm/gvm.h>
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/vmcpuset.h>
 #include <VBox/vmm/vmm.h>
 #include <VBox/param.h>

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -107 +107 @@
 
     /*
-     * Initialize the GVMM, GMM, HWACCM, PGM (Darwin) and INTNET.
-     */
-    int rc = GVMMR0Init();
+     * Initialize the VMM, GVMM, GMM, HWACCM, PGM (Darwin) and INTNET.
+     */
+    int rc = vmmInitFormatTypes();
     if (RT_SUCCESS(rc))
     {
-        rc = GMMR0Init();
+        rc = GVMMR0Init();
         if (RT_SUCCESS(rc))
         {
-            rc = HWACCMR0Init();
+            rc = GMMR0Init();
             if (RT_SUCCESS(rc))
             {
-                rc = PGMRegisterStringFormatTypes();
+                rc = HWACCMR0Init();
                 if (RT_SUCCESS(rc))
                 {
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-                    rc = PGMR0DynMapInit();
-#endif
+                    rc = PGMRegisterStringFormatTypes();
                     if (RT_SUCCESS(rc))
                     {
-                        rc = IntNetR0Init();
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+                        rc = PGMR0DynMapInit();
+#endif
                         if (RT_SUCCESS(rc))
                         {
-#ifdef VBOX_WITH_PCI_PASSTHROUGH
-                            rc = PciRawR0Init();
-#endif
+                            rc = IntNetR0Init();
                             if (RT_SUCCESS(rc))
                             {
-                                rc = CPUMR0ModuleInit();
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+                                rc = PciRawR0Init();
+#endif
                                 if (RT_SUCCESS(rc))
                                 {
+                                    rc = CPUMR0ModuleInit();
+                                    if (RT_SUCCESS(rc))
+                                    {
 #ifdef VBOX_WITH_TRIPLE_FAULT_HACK
-                                    rc = vmmR0TripleFaultHackInit();
-                                    if (RT_SUCCESS(rc))
-#endif
-                                    {
-                                        LogFlow(("ModuleInit: returns success.\n"));
-                                        return VINF_SUCCESS;
+                                        rc = vmmR0TripleFaultHackInit();
+                                        if (RT_SUCCESS(rc))
+#endif
+                                        {
+                                            LogFlow(("ModuleInit: returns success.\n"));
+                                            return VINF_SUCCESS;
+                                        }
+
+                                        /*
+                                         * Bail out.
+                                         */
+#ifdef VBOX_WITH_TRIPLE_FAULT_HACK
+                                        vmmR0TripleFaultHackTerm();
+#endif
                                     }
-
-                                    /*
-                                     * Bail out.
-                                     */
-#ifdef VBOX_WITH_TRIPLE_FAULT_HACK
-                                    vmmR0TripleFaultHackTerm();
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+                                    PciRawR0Term();
 #endif
                                 }
-#ifdef VBOX_WITH_PCI_PASSTHROUGH
-                                PciRawR0Term();
-#endif
+                                IntNetR0Term();
                             }
-                            IntNetR0Term();
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+                            PGMR0DynMapTerm();
+#endif
                         }
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-                        PGMR0DynMapTerm();
-#endif
+                        PGMDeregisterStringFormatTypes();
                     }
-                    PGMDeregisterStringFormatTypes();
+                    HWACCMR0Term();
                 }
-                HWACCMR0Term();
+                GMMR0Term();
             }
-            GMMR0Term();
-        }
-       GVMMR0Term();
+           GVMMR0Term();
+        }
+        vmmTermFormatTypes();
     }
 
@@ -215 +220 @@
     GMMR0Term();
     GVMMR0Term();
+
+    vmmTermFormatTypes();
 
     LogFlow(("ModuleTerm: returns\n"));

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

@@ -256 +256 @@
                 DBGFR3InfoRegisterInternal(pVM, "ff", "Displays the current Forced actions Flags.", vmmR3InfoFF);
                 vmmR3InitRegisterStats(pVM);
+                vmmInitFormatTypes();
 
                 return VINF_SUCCESS;
@@ -767 +768 @@
     }
 #endif
+
+    vmmTermFormatTypes();
     return rc;
 }

trunk/src/VBox/VMM/include/VMMInternal.h

@@ -506 +506 @@
 RT_C_DECLS_BEGIN
 
+int  vmmInitFormatTypes(void);
+void vmmTermFormatTypes(void);
+
 #ifdef IN_RING3
 int  vmmR3SwitcherInit(PVM pVM);