Changeset 6914 in vbox for trunk

Timestamp:

Feb 11, 2008 11:17:43 PM (17 years ago)

Author:

vboxsync

Message:

Replaced PGMR3DumpMappings by info handler.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (2 diffs)
• PGMHandler.cpp (modified) (2 diffs)
• PGMInternal.h (modified) (1 diff)
• PGMMap.cpp (modified) (2 diffs)
• VMM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -941 +941 @@
         DBGFR3InfoRegisterInternal(pVM, "handlers",
                                    "Dumps physical, virtual and hyper virtual handlers. "
-                                   "Pass 'phys', 'virt', 'hyper' as argument if only one kind is wanted. "
-                                   "Add 'nost' if the statistics are unwanted.",
+                                   "Pass 'phys', 'virt', 'hyper' as argument if only one kind is wanted."
+                                   "Add 'nost' if the statistics are unwanted, use together with 'all' or explicit selection.",
                                    pgmR3InfoHandlers);
+        DBGFR3InfoRegisterInternal(pVM, "mappings",
+                                   "Dumps guest mappings.",
+                                   pgmR3MapInfo);
 
         STAM_REL_REG(pVM, &pVM->pgm.s.cGuestModeChanges, STAMTYPE_COUNTER, "/PGM/cGuestModeChanges", STAMUNIT_OCCURENCES, "Number of guest mode changes.");
@@ -1692 +1695 @@
     AssertRC(rc);
 #ifdef DEBUG
-    PGMR3DumpMappings(pVM);
+    DBGFR3InfoLog(pVM, "mappings", NULL);
+    DBGFR3InfoLog(pVM, "handlers", "all nostat");
 #endif
 

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -515 +515 @@
      * Test input.
      */
-    PGMHANDLERINFOARG Args = { pHlp, true };
+    PGMHANDLERINFOARG Args = { pHlp, /* .fStats = */ true };
     bool fPhysical = !pszArgs  || !*pszArgs;
     bool fVirtual = fPhysical;
@@ -521 +521 @@
     if (!fPhysical)
     {
-        fPhysical = strstr(pszArgs, "phys") != NULL;
-        fVirtual = strstr(pszArgs, "virt") != NULL;
-        fHyper = strstr(pszArgs, "hyper") != NULL;
+        bool fAll = strstr(pszArgs, "all") != NULL;
+        fPhysical   = fAll || strstr(pszArgs, "phys") != NULL;
+        fVirtual    = fAll || strstr(pszArgs, "virt") != NULL;
+        fHyper      = fAll || strstr(pszArgs, "hyper")!= NULL;
         Args.fStats = strstr(pszArgs, "nost") == NULL;
     }

trunk/src/VBox/VMM/PGMInternal.h

@@ -2468 +2468 @@
 __BEGIN_DECLS
 
+int             pgmLock(PVM pVM);
+void            pgmUnlock(PVM pVM);
+
 PGMGCDECL(int)  pgmGCGuestPDWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 PGMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
+int             pgmR3ChangeMode(PVM pVM, PGMMODE enmGuestMode);
+
 int             pgmR3SyncPTResolveConflict(PVM pVM, PPGMMAPPING pMapping, PVBOXPD pPDSrc, int iPDOld);
 PPGMMAPPING     pgmGetMapping(PVM pVM, RTGCPTR GCPtr);
 void            pgmR3MapRelocate(PVM pVM, PPGMMAPPING pMapping, int iPDOld, int iPDNew);
-int             pgmR3ChangeMode(PVM pVM, PGMMODE enmGuestMode);
-int             pgmLock(PVM pVM);
-void            pgmUnlock(PVM pVM);
+DECLCALLBACK(void) pgmR3MapInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 
 void            pgmR3HandlerPhysicalUpdateAll(PVM pVM);

trunk/src/VBox/VMM/PGMMap.cpp

@@ -38 +38 @@
 static void              pgmR3MapClearPDEs(PPGM pPGM, PPGMMAPPING pMap, int iOldPDE);
 static void              pgmR3MapSetPDEs(PVM pVM, PPGMMAPPING pMap, int iNewPDE);
-static DECLCALLBACK(int) pgmR3DumpMappingsPhysicalCB(PAVLROGCPHYSNODECORE pNode, void *pvUser);
 static int               pgmR3MapIntermediateCheckOne(PVM pVM, uintptr_t uAddress, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault);
 static void              pgmR3MapIntermediateDoOne(PVM pVM, uintptr_t uAddress, RTHCPHYS HCPhys, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault);
@@ -1078 +1077 @@
 
 /**
- * Dumps one virtual handler range.
- *
- * @returns 0
- * @param   pNode   Pointer to a PGMVIRTHANDLER.
- * @param   pvUser  Pointer to command helper functions.
- */
-static DECLCALLBACK(int) pgmVirtHandlerDump(PAVLROGCPTRNODECORE pNode, void *pvUser)
-{
-    PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)pNode;
-
-    switch (pCur->enmType)
-    {
-        case PGMVIRTHANDLERTYPE_WRITE:
-            RTLogPrintf("WRITE    %RGv-%RGv size %RGv %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->cb, pCur->pszDesc);
-            break;
-        case PGMVIRTHANDLERTYPE_ALL:
-            RTLogPrintf("ALL      %RGv-%RGv size %RGv %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->cb, pCur->pszDesc);
-            break;
-        case PGMVIRTHANDLERTYPE_HYPERVISOR:
-            RTLogPrintf("WRITEHYP %RGv-%RGv size %RGv %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->cb, pCur->pszDesc);
-            break;
-    }
-    if (pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR)
-        for (unsigned i = 0; i < pCur->cPages; i++)
-            RTLogPrintf("Physical page %#05d %VGp\n", i, pCur->aPhysToVirt[i].Core.Key);
-    return 0;
-}
-
-/**
- * Dumps the current mappings to the log
- *
- * @returns VBox status.
- * @param   pVM         Pointer to the current VM (if any).
- *
- */
-PGMR3DECL(void) PGMR3DumpMappings(PVM pVM)
-{
-    /*
-     * Print message about the fixedness of the mappings and dump them.
-     */
-    RTLogPrintf(pVM->pgm.s.fMappingsFixed ? "\nThe mappings are FIXED.\n" : "\nThe mappings are FLOATING.\n");
-
+ * Info callback for 'pgmhandlers'.
+ *
+ * @param   pHlp        The output helpers.
+ * @param   pszArgs     The arguments. phys or virt.
+ */
+DECLCALLBACK(void) pgmR3MapInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    pHlp->pfnPrintf(pHlp, pVM->pgm.s.fMappingsFixed 
+                    ? "\nThe mappings are FIXED.\n" 
+                    : "\nThe mappings are FLOATING.\n");
     PPGMMAPPING pCur;
     for (pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)
-        RTLogPrintf("%VGv - %VGv  %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->pszDesc);
-
-/** @todo The handler stuff is totally alien here. This should be converted into a 'info' function. 
- * There are now, just kill this. */
-    RTLogPrintf("\nVirtual handlers:\n");
-    RTAvlroGCPtrDoWithAll(&pVM->pgm.s.pTreesHC->VirtHandlers, true, pgmVirtHandlerDump, pVM);
-
-    RTLogPrintf("\n"
-                "Physical handlers: (PhysHandlers=%d (%#x))\n"
-                "From     - To (incl) HandlerHC UserHC    HandlerHC UserHC    HandlerGC UserGC    Type     Description\n",
-                pVM->pgm.s.pTreesHC->PhysHandlers, pVM->pgm.s.pTreesHC->PhysHandlers);
-    RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesHC->PhysHandlers, true, pgmR3DumpMappingsPhysicalCB, NULL);
-}
-
-
-/**
- * Dumps one physical handler range.
- *
- * @returns 0
- * @param   pNode   Pointer to a PGMPHYSHANDLER.
- * @param   pvUser  Ignored.
- */
-static DECLCALLBACK(int) pgmR3DumpMappingsPhysicalCB(PAVLROGCPHYSNODECORE pNode, void *pvUser)
-{
-    PPGMPHYSHANDLER pCur = (PPGMPHYSHANDLER)pNode; NOREF(pvUser);
-    const char *pszType;
-    switch (pCur->enmType)
-    {
-        case PGMPHYSHANDLERTYPE_MMIO:           pszType = "MMIO   "; break;
-        case PGMPHYSHANDLERTYPE_PHYSICAL_WRITE: pszType = "Write  "; break;
-        case PGMPHYSHANDLERTYPE_PHYSICAL_ALL:   pszType = "All    "; break;
-        default:                                pszType = "????"; break;
-    }
-    RTLogPrintf("%VGp - %VGp  %VHv  %VHv  %VHv  %VHv  %VGv  %VGv  %s  %s\n",
-                pCur->Core.Key, pCur->Core.KeyLast, pCur->pfnHandlerR3, pCur->pvUserR3, pCur->pfnHandlerR0, pCur->pvUserR0,
-                pCur->pfnHandlerGC, pCur->pvUserGC, pszType, pCur->pszDesc);
-    return 0;
-}
-
+        pHlp->pfnPrintf(pHlp, "%VGv - %VGv  %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->pszDesc);
+}
+

trunk/src/VBox/VMM/VMM.cpp

@@ -2596 +2596 @@
 
     /*
-     * Dump useful state information.
-     */
-    /** @todo convert these dumpers to DBGFR3Info() handlers!!! */
-    pHlp->pfnPrintf(pHlp,
-                    "!!\n"
-                    "!! PGM Access Handlers & Stuff:\n"
-                    "!!\n");
-    PGMR3DumpMappings(pVM);
-
-
-    /*
      * Generic info dumper loop.
      */
@@ -2615 +2604 @@
     } const     aInfo[] =
     {
+        { "mappings",       NULL },
         { "hma",            NULL },
         { "cpumguest",      "verbose" },
@@ -2630 +2620 @@
         { "timers",         NULL },
         { "activetimers",   NULL },
-        { "handlers",       "phys virt stats" },
+        { "handlers",       "phys virt hyper stats" },
         { "cfgm",           NULL },
     };