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

Timestamp:

Jun 4, 2018 11:38:23 AM (7 years ago)

Author:

vboxsync

Message:

IPRT,VMM: Added custom thread name for ring-0 logging (VMM).

File:

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

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

@@ -175 +175 @@
     char * volatile         pchRingBufCur;
     /** @} */
+
+    /** Thread name for use in ring-0 with RTLOGFLAGS_PREFIX_THREAD. */
+    char                    szR0ThreadName[16];
 
 # ifdef IN_RING3 /* Note! Must be at the end! */
@@ -826 +829 @@
         pLogger->pInt->pfnPrefix                = NULL;
         pLogger->pInt->pvPrefixUserArg          = NULL;
-        pLogger->pInt->afPadding1[0]            = false;
-        pLogger->pInt->afPadding1[1]            = false;
         pLogger->pInt->fCreated                 = false;
+        RT_ZERO(pLogger->pInt->szR0ThreadName);
         pLogger->pInt->cMaxGroups               = cGroups;
         pLogger->pInt->papszGroups              = papszGroups;
@@ -1274 +1276 @@
 RTDECL(int) RTLogCreateForR0(PRTLOGGER pLogger, size_t cbLogger,
                              RTR0PTR pLoggerR0Ptr, RTR0PTR pfnLoggerR0Ptr, RTR0PTR pfnFlushR0Ptr,
-                             uint32_t fFlags, uint32_t fDestFlags)
+                             uint32_t fFlags, uint32_t fDestFlags, char const *pszThreadName)
 {
     /*
@@ -1284 +1286 @@
     AssertReturn(pLoggerR0Ptr != NIL_RTR0PTR, VERR_INVALID_PARAMETER);
     AssertReturn(pfnLoggerR0Ptr != NIL_RTR0PTR, VERR_INVALID_PARAMETER);
+    size_t const cchThreadName = pszThreadName ? strlen(pszThreadName) : 0;
+    AssertReturn(cchThreadName < sizeof(pLogger->pInt->szR0ThreadName), VERR_INVALID_NAME);
 
     /*
@@ -1327 +1331 @@
     else
         pInt->pacEntriesPerGroup= NULL;
+
+    RT_ZERO(pInt->szR0ThreadName);
+    if (cchThreadName)
+        memcpy(pInt->szR0ThreadName, pszThreadName, cchThreadName);
 
     pInt->fCreated              = true;
@@ -3815 +3823 @@
                     const char *pszName = "EMT-RC";
 #else
-                    const char *pszName = "R0";
+                    const char *pszName = pLogger->pInt->szR0ThreadName[0] ? pLogger->pInt->szR0ThreadName : "R0";
 #endif
                     psz = rtLogStPNCpyPad(psz, pszName, 16, 8);