Changeset 72778 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jun 29, 2018 8:02:35 PM (6 years ago)

Author:

vboxsync

Message:

VMM,SUPDrv,IPRT: Redirect ring-0 release logging on EMTs to VBox.log.

• VMM: Added release ring-0 logging on EMTs that writes to VBox.log.
• IPRT: Made 'msprog' and 'timeprog' work for ring-0 logging on EMTs.
• IPRT: Removed RTLogSetCustomPrefixCallbackForR0.
• VMM: Removed vmmR0LoggerPrefix that was assoicated with the above API.
• IPRT Fixed missing log prefix on the first log line.
• SUPDrv: Turns out we require actual code for SUPR0GetDefaultLogRelInstanceEx and SUPR0GetDefaultLogInstanceEx.

Note! Requires updating the support driver.

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (10 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -60 +60 @@
 # include <iprt/alloca.h>
 # include <stdio.h>
+# include "internal/time.h" /* For g_u64ProgramStartNanoTS. */
 #endif
 
@@ -176 +177 @@
     /** @} */
 
+    /** Program time base for ring-0 (copy of g_u64ProgramStartNanoTS). */
+    uint64_t                nsR0ProgramStart;
     /** Thread name for use in ring-0 with RTLOGFLAGS_PREFIX_THREAD. */
     char                    szR0ThreadName[16];
@@ -207 +210 @@
 
 /** The revision of the internal logger structure. */
-# define RTLOGGERINTERNAL_REV    UINT32_C(10)
+# define RTLOGGERINTERNAL_REV    UINT32_C(11)
 
 # ifdef IN_RING3
@@ -829 +832 @@
         pLogger->pInt->pfnPrefix                = NULL;
         pLogger->pInt->pvPrefixUserArg          = NULL;
+        pLogger->pInt->fPendingPrefix           = true;
         pLogger->pInt->fCreated                 = false;
+        pLogger->pInt->nsR0ProgramStart         = 0;
         RT_ZERO(pLogger->pInt->szR0ThreadName);
         pLogger->pInt->cMaxGroups               = cGroups;
@@ -1320 +1325 @@
     pInt->pfnPrefix             = NULL;
     pInt->pvPrefixUserArg       = NULL;
-    pInt->fPendingPrefix        = false;
+    pInt->fPendingPrefix        = true;
     pInt->cMaxGroups            = cMaxGroups;
     pInt->papszGroups           = NULL;
@@ -1331 +1336 @@
     else
         pInt->pacEntriesPerGroup= NULL;
-
+    pInt->nsR0ProgramStart      = g_u64ProgramStartNanoTS;
     RT_ZERO(pInt->szR0ThreadName);
     if (cchThreadName)
@@ -1401 +1406 @@
 RT_EXPORT_SYMBOL(RTLogCopyGroupsAndFlagsForR0);
 
-
-RTDECL(int) RTLogSetCustomPrefixCallbackForR0(PRTLOGGER pLogger, RTR0PTR pLoggerR0Ptr,
-                                              RTR0PTR pfnCallbackR0Ptr, RTR0PTR pvUserR0Ptr)
-{
-    AssertPtrReturn(pLogger, VERR_INVALID_POINTER);
-    AssertReturn(pLogger->u32Magic == RTLOGGER_MAGIC, VERR_INVALID_MAGIC);
-
-    /*
-     * Do the work.
-     */
-    PRTLOGGERINTERNAL pInt = (PRTLOGGERINTERNAL)((uintptr_t)pLogger->pInt - pLoggerR0Ptr + (uintptr_t)pLogger);
-    AssertReturn(pInt->uRevision == RTLOGGERINTERNAL_REV, VERR_LOG_REVISION_MISMATCH);
-    pInt->pvPrefixUserArg = (void *)pvUserR0Ptr;
-    pInt->pfnPrefix       = (PFNRTLOGPREFIX)pfnCallbackR0Ptr;
-
-    return VINF_SUCCESS;
-}
-RT_EXPORT_SYMBOL(RTLogSetCustomPrefixCallbackForR0);
 
 RTDECL(void) RTLogFlushR0(PRTLOGGER pLogger, PRTLOGGER pLoggerR0)
@@ -3724 +3711 @@
                     uint64_t u64 = RTTimeProgramMilliTS();
 #else
-                    uint64_t u64 = 0;
+                    uint64_t u64 = (RTTimeNanoTS() - pLogger->pInt->nsR0ProgramStart) / 1000000;
 #endif
                     /* 1E8 milliseconds = 27 hours */
@@ -3758 +3745 @@
 #if defined(IN_RING3) || defined(IN_RC)
                     uint64_t u64 = RTTimeProgramMicroTS();
+#else
+                    uint64_t u64 = (RTTimeNanoTS() - pLogger->pInt->nsR0ProgramStart) / 1000;
+
+#endif
                     psz += RTStrFormatNumber(psz, (uint32_t)(u64 / RT_US_1HOUR), 10, 2, 0, RTSTR_F_ZEROPAD);
                     *psz++ = ':';
@@ -3769 +3760 @@
                     psz += RTStrFormatNumber(psz, u32 % RT_US_1SEC, 10, 6, 0, RTSTR_F_ZEROPAD);
                     *psz++ = ' ';
-#else
-                    memset(psz, ' ', 16);
-                    psz += 16;
-#endif
                 }
 #define CCH_PREFIX_05   CCH_PREFIX_04 + (9+1+2+1+2+1+6+1)