Changeset 90862 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 25, 2021 12:37:59 AM (3 years ago)

Author:

vboxsync

Message:

IPRT,SUPDrv,VMM,++: Bumped major support driver version. Added RTLogSetR0ProgramStart and make the VMM use it when configuring the ring-0 loggers. Removed pfnFlush from the parameter list of RTLogCreateEx[V]. bugref:10086

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/VMMR0.cpp (modified) (4 diffs)
• VMMR3/VMM.cpp (modified) (1 diff)
• include/VMMInternal.h (modified) (1 diff)

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

@@ -392 +392 @@
  */
 static int vmmR0InitLoggerOne(PGVMCPU pGVCpu, bool fRelease, PVMMR0PERVCPULOGGER pR0Log, PVMMR3CPULOGGER pShared,
-                              uint32_t cbBuf, char *pchBuf, RTR3PTR pchBufR3)
+                              uint32_t cbBuf, char *pchBuf, RTR3PTR pchBufR3, uint64_t nsProgramStart)
 {
     pR0Log->BufDesc.u32Magic    = RTLOGBUFFERDESC_MAGIC;
@@ -412 +412 @@
     int rc = RTLogCreateEx(&pR0Log->pLogger, fRelease ? "VBOX_RELEASE_LOG" : "VBOX_LOG", RTLOG_F_NO_LOCKING | RTLOGFLAGS_BUFFERED,
                            "all", RT_ELEMENTS(s_apszGroups), s_apszGroups, UINT32_MAX,
-                           fRelease ? vmmR0LogRelFlush : vmmR0LogFlush, 1 /*cBufDescs*/, &pR0Log->BufDesc,
-                           RTLOGDEST_DUMMY,
+                           1 /*cBufDescs*/, &pR0Log->BufDesc, RTLOGDEST_DUMMY,
                            NULL /*pfnPhase*/, 0 /*cHistory*/, 0 /*cbHistoryFileMax*/, 0 /*cSecsHistoryTimeSlot*/,
                            NULL /*pErrInfo*/, NULL /*pszFilenameFmt*/);
@@ -423 +422 @@
         pLogger->u64UserValue3 = (uintptr_t)pGVCpu;
 
-        RTLogSetR0ThreadNameF(pLogger, "EMT-%u-R0", pGVCpu->idCpu);
-    }
-    else
-        pR0Log->pLogger = NULL;
+        rc = RTLogSetFlushCallback(pLogger, fRelease ? vmmR0LogRelFlush : vmmR0LogFlush);
+        if (RT_SUCCESS(rc))
+        {
+            RTLogSetR0ThreadNameF(pLogger, "EMT-%u-R0", pGVCpu->idCpu);
+            RTLogSetR0ProgramStart(pLogger, nsProgramStart);
+            return VINF_SUCCESS;
+        }
+
+        RTLogDestroy(pLogger);
+    }
+    pR0Log->pLogger = NULL;
     return rc;
 }
@@ -455 +461 @@
                 PVMMR0PERVCPULOGGER pR0Log  = fRelease ? &pGVCpu->vmmr0.s.RelLogger : &pGVCpu->vmmr0.s.Logger;
                 PVMMR3CPULOGGER     pShared = fRelease ? &pGVCpu->vmm.s.RelLogger   : &pGVCpu->vmm.s.Logger;
-                rc = vmmR0InitLoggerOne(pGVCpu, fRelease, pR0Log, pShared, cbBuf, pchBuf + i * cbBuf, pchBufR3 + i * cbBuf);
+                rc = vmmR0InitLoggerOne(pGVCpu, fRelease, pR0Log, pShared, cbBuf, pchBuf + i * cbBuf, pchBufR3 + i * cbBuf,
+                                        pGVM->vmm.s.nsProgramStart);
                 if (RT_FAILURE(rc))
                 {

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

@@ -207 +207 @@
     pVM->vmm.s.hEvtRendezvousRecursionPushCaller = NIL_RTSEMEVENT;
     pVM->vmm.s.hEvtRendezvousRecursionPopCaller = NIL_RTSEMEVENT;
+    pVM->vmm.s.nsProgramStart                   = RTTimeProgramStartNanoTS();
 
 #if 0 /* pointless when timers doesn't run on EMT */

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

@@ -285 +285 @@
     /** Buffer for storing the custom message for a ring-0 assertion. */
     char                        szRing0AssertMsg2[256];
+
+    /** Used when setting up ring-0 logger. */
+    uint64_t                    nsProgramStart;
 
     /** Number of VMMR0_DO_HM_RUN or VMMR0_DO_NEM_RUN calls. */