Changeset 89695 in vbox

Timestamp:

Jun 15, 2021 9:51:59 AM (4 years ago)

Author:

vboxsync

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

145143

Message:

VMM/DBGFR3SampleReport: Implement dump to file method, bugref:10025

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/VMMR3/DBGFR3SampleReport.cpp (modified) (11 diffs)

trunk/include/VBox/err.h

@@ -361 +361 @@
 /** The breakpoint owner callback returned an invalid status code. */
 #define VERR_DBGF_BP_OWNER_CALLBACK_WRONG_STATUS (-1240)
+/** The operation was cancelled. */
+#define VERR_DBGF_CANCELLED                 (-1241)
 /** @} */
 

trunk/src/VBox/VMM/Makefile.kmk

@@ -119 +119 @@
         VMMR3/DBGFR3Trace.cpp \
         $(if-expr defined(VBOX_WITH_DBGF_TRACING), VMMR3/DBGFR3Tracer.cpp,) \
-        $(if-expr defined(VBOX_WITH_DBGF_SAMPLE_REPORT), VMMR3/DBGFR3SampleReport.cpp,) \
+        VMMR3/DBGFR3SampleReport.cpp \
         VMMR3/DBGFR3Type.cpp \
         VMMR3/EM.cpp \

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

@@ -42 +42 @@
 #include <iprt/timer.h>
 #include <iprt/string.h>
+#include <iprt/stream.h>
 
 
@@ -132 +133 @@
     /** Number of microseconds left for sampling. */
     uint64_t                         cSampleUsLeft;
+    /** The report created after sampling was stopped. */
+    char                             *pszReport;
     /** Array of per VCPU samples collected. */
     DBGFSAMPLEREPORTVCPU             aCpus[1];
@@ -331 +334 @@
  *
  * @returns nothing.
+ * @param   pHlp                    The debug info helper used for printing.
  * @param   pUVM                    The usermode VM handle.
  * @param   pFrame                  The frame to dump.
  * @param   idxFrame                The frame number.
  */
-static void dbgfR3SampleReportDumpFrame(PUVM pUVM, PCDBGFSAMPLEFRAME pFrame, uint32_t idxFrame)
+static void dbgfR3SampleReportDumpFrame(PCDBGFINFOHLP pHlp, PUVM pUVM, PCDBGFSAMPLEFRAME pFrame, uint32_t idxFrame)
 {
     RTGCINTPTR offDisp;
@@ -350 +354 @@
             const char *pszModName = hMod != NIL_RTDBGMOD ? RTDbgModName(hMod) : NULL;
 
-            LogRel(("%*s%RU64 %s+%llx (%s) [%RGv]\n", idxFrame * 4, " ",
-                                                      pFrame->cSamples,
-                                                      SymPC.szName, offDisp,
-                                                      hMod ? pszModName : "",
-                                                      pFrame->AddrFrame.FlatPtr));
+            pHlp->pfnPrintf(pHlp,
+                            "%*s%RU64 %s+%llx (%s) [%RGv]\n", idxFrame * 4, " ",
+                                                              pFrame->cSamples,
+                                                              SymPC.szName, offDisp,
+                                                              hMod ? pszModName : "",
+                                                              pFrame->AddrFrame.FlatPtr);
             RTDbgModRelease(hMod);
         }
         else
-            LogRel(("%*s%RU64 %RGv\n", idxFrame * 4, " ", pFrame->cSamples, pFrame->AddrFrame.FlatPtr));
+            pHlp->pfnPrintf(pHlp, "%*s%RU64 %RGv\n", idxFrame * 4, " ", pFrame->cSamples, pFrame->AddrFrame.FlatPtr);
     }
     else
-        LogRel(("%*s%RU64 %RGv\n", idxFrame * 4, " ", pFrame->cSamples, pFrame->AddrFrame.FlatPtr));
+        pHlp->pfnPrintf(pHlp, "%*s%RU64 %RGv\n", idxFrame * 4, " ", pFrame->cSamples, pFrame->AddrFrame.FlatPtr);
 
     for (uint32_t i = 0; i < pFrame->cFramesValid; i++)
-        dbgfR3SampleReportDumpFrame(pUVM, &pFrame->paFrames[i], idxFrame + 1);
+        dbgfR3SampleReportDumpFrame(pHlp, pUVM, &pFrame->paFrames[i], idxFrame + 1);
 }
 
@@ -441 +446 @@
             pThis->hTimer = NULL;
 
-#if 1
+            DBGFSAMPLEREPORTINFOHLP Hlp;
+            PCDBGFINFOHLP           pHlp = &Hlp.Core;
+
+            dbgfR3SampleReportInfoHlpInit(&Hlp);
+
             /* Some early dump code. */
             for (uint32_t i = 0; i < pThis->pUVM->cCpus; i++)
@@ -447 +456 @@
                 PCDBGFSAMPLEREPORTVCPU pSampleVCpu = &pThis->aCpus[i];
 
-                LogRel(("Sample report for vCPU %u:\n", i));
-                dbgfR3SampleReportDumpFrame(pThis->pUVM, &pSampleVCpu->FrameRoot, 0);
+                pHlp->pfnPrintf(pHlp, "Sample report for vCPU %u:\n", i);
+                dbgfR3SampleReportDumpFrame(pHlp, pThis->pUVM, &pSampleVCpu->FrameRoot, 0);
             }
-
-            DBGFSAMPLEREPORTINFOHLP Hlp;
-            PCDBGFINFOHLP           pHlp = &Hlp.Core;
-
-            dbgfR3SampleReportInfoHlpInit(&Hlp);
 
             /* Shameless copy from VMMGuruMeditation.cpp */
@@ -494 +498 @@
                             "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
 
-            LogRel(("%s", Hlp.pachBuf));
+            if (pThis->pszReport)
+                RTMemFree(pThis->pszReport);
+            pThis->pszReport = Hlp.pachBuf;
             dbgfR3SampleReportInfoHlpDelete(&Hlp);
-#endif
+
+            ASMAtomicXchgU32((volatile uint32_t *)&pThis->enmState, DBGFSAMPLEREPORTSTATE_READY);
 
             if (pThis->pfnProgress)
@@ -505 +512 @@
             }
 
-            ASMAtomicXchgU32((volatile uint32_t *)&pThis->enmState, DBGFSAMPLEREPORTSTATE_READY);
             DBGFR3SampleReportRelease(pThis);
         }
@@ -617 +623 @@
  * @returns New reference count, on 0 the sample report instance is destroyed.
  * @param   hSample                 Sample report handle.
- *
- * @note Can't be called from the progress callback passed during creation.
  */
 VMMR3DECL(uint32_t) DBGFR3SampleReportRelease(DBGFSAMPLEREPORT hSample)
@@ -718 +722 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_INVALID_STATE if nothing was sampled so far for reporting.
  * @param   hSample                 Sample report handle.
  * @param   pszFilename             The filename to dump the report to.
@@ -723 +728 @@
 VMMR3DECL(int) DBGFR3SampleReportDumpToFile(DBGFSAMPLEREPORT hSample, const char *pszFilename)
 {
-    RT_NOREF(hSample, pszFilename);
-    return VINF_SUCCESS;
-}
-
+    PDBGFSAMPLEREPORTINT pThis = hSample;
+
+    AssertReturn(pThis->pszReport, VERR_INVALID_STATE);
+
+    PRTSTREAM hStream;
+    int rc = RTStrmOpen(pszFilename, "w", &hStream);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTStrmPutStr(hStream, pThis->pszReport);
+        RTStrmClose(hStream);
+    }
+
+    return rc;
+}
+