Changeset 20854 in vbox

Timestamp:

Jun 23, 2009 4:32:12 PM (15 years ago)

Author:

vboxsync

Message:

VMM: Use the custom logger prefix to indicate the virtual CPU ID.

Location:

trunk/src/VBox/VMM

Files:

• VM.cpp (modified) (4 diffs)
• VMM.cpp (modified) (2 diffs)
• VMMInternal.h (modified) (2 diffs)
• VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VM.cpp

@@ -131 +131 @@
 static int               vmR3InitGC(PVM pVM);
 static int               vmR3InitDoCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
+static DECLCALLBACK(size_t) vmR3LogPrefixCallback(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser);
 static DECLCALLBACK(int) vmR3PowerOn(PVM pVM);
 static DECLCALLBACK(int) vmR3Suspend(PVM pVM);
@@ -645 +646 @@
                                     {
                                         /*
-                                        * Set the state and link into the global list.
-                                        */
+                                         * Set the state and link into the global list.
+                                         */
                                         vmR3SetState(pVM, VMSTATE_CREATED);
                                         pUVM->pNext = g_pUVMsHead;
                                         g_pUVMsHead = pUVM;
+
+#ifdef LOG_ENABLED
+                                        RTLogSetCustomPrefixCallback(NULL, vmR3LogPrefixCallback, pUVM);
+#endif
                                         return VINF_SUCCESS;
                                     }
@@ -1039 +1044 @@
 
 /**
+ * Logger callback for inserting a custom prefix.
+ *
+ * @returns Number of chars written.
+ * @param   pLogger             The logger.
+ * @param   pchBuf              The output buffer.
+ * @param   cchBuf              The output buffer size.
+ * @param   pvUser              Pointer to the UVM structure.
+ */
+static DECLCALLBACK(size_t) vmR3LogPrefixCallback(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser)
+{
+    AssertReturn(cchBuf >= 2, 0);
+    PUVM        pUVM   = (PUVM)pvUser;
+    PUVMCPU     pUVCpu = (PUVMCPU)RTTlsGet(pUVM->vm.s.idxTLS);
+    if (pUVCpu)
+    {
+        static const char s_szHex[17] = "0123456789abcdef";
+        VMCPUID const     idCpu       = pUVCpu->idCpu;
+        pchBuf[1] = s_szHex[ idCpu       & 15];
+        pchBuf[0] = s_szHex[(idCpu >> 4) & 15];
+    }
+    else
+    {
+        pchBuf[0] = 'x';
+        pchBuf[1] = 'y';
+    }
+
+    return 2;
+}
+
+
+/**
  * Calls the relocation functions for all VMM components so they can update
  * any GC pointers. When this function is called all the basic VM members
@@ -2032 +2068 @@
     STAMR3TermUVM(pUVM);
 
+#ifdef LOG_ENABLED
+    RTLogSetCustomPrefixCallback(NULL, NULL, NULL);
+#endif
     RTTlsFree(pUVM->vm.s.idxTLS);
 

trunk/src/VBox/VMM/VMM.cpp

@@ -808 +808 @@
      * in ring-0. Only initialize it once.
      */
-    for (unsigned i = 0; i < pVM->cCPUs; i++)
+    for (VMCPUID i = 0; i < pVM->cCPUs; i++)
     {
         PVMCPU       pVCpu = &pVM->aCpus[i];
@@ -818 +818 @@
                 RTR0PTR pfnLoggerWrapper = NIL_RTR0PTR;
                 rc = PDMR3LdrGetSymbolR0(pVM, VMMR0_MAIN_MODULE_NAME, "vmmR0LoggerWrapper", &pfnLoggerWrapper);
-                AssertReleaseMsgRCReturn(rc, ("VMMLoggerWrapper not found! rc=%Rra\n", rc), rc);
+                AssertReleaseMsgRCReturn(rc, ("vmmR0LoggerWrapper not found! rc=%Rra\n", rc), rc);
 
                 RTR0PTR pfnLoggerFlush = NIL_RTR0PTR;
                 rc = PDMR3LdrGetSymbolR0(pVM, VMMR0_MAIN_MODULE_NAME, "vmmR0LoggerFlush", &pfnLoggerFlush);
-                AssertReleaseMsgRCReturn(rc, ("VMMLoggerFlush not found! rc=%Rra\n", rc), rc);
+                AssertReleaseMsgRCReturn(rc, ("vmmR0LoggerFlush not found! rc=%Rra\n", rc), rc);
 
                 rc = RTLogCreateForR0(&pR0LoggerR3->Logger, pR0LoggerR3->cbLogger,
-                                    *(PFNRTLOGGER *)&pfnLoggerWrapper, *(PFNRTLOGFLUSH *)&pfnLoggerFlush,
-                                    RTLOGFLAGS_BUFFERED, RTLOGDEST_DUMMY);
+                                      *(PFNRTLOGGER *)&pfnLoggerWrapper, *(PFNRTLOGFLUSH *)&pfnLoggerFlush,
+                                      RTLOGFLAGS_BUFFERED, RTLOGDEST_DUMMY);
                 AssertReleaseMsgRCReturn(rc, ("RTLogCreateForR0 failed! rc=%Rra\n", rc), rc);
+
+                RTR0PTR pfnLoggerPrefix = NIL_RTR0PTR;
+                rc = PDMR3LdrGetSymbolR0(pVM, VMMR0_MAIN_MODULE_NAME, "vmmR0LoggerPrefix", &pfnLoggerPrefix);
+                AssertReleaseMsgRCReturn(rc, ("vmmR0LoggerPrefix not found! rc=%Rra\n", rc), rc);
+                rc = RTLogSetCustomPrefixCallback(&pR0LoggerR3->Logger, *(PFNRTLOGPREFIX *)&pfnLoggerPrefix, NULL);
+                AssertReleaseMsgRCReturn(rc, ("RTLogSetCustomPrefixCallback failed! rc=%Rra\n", rc), rc);
+
+                pR0LoggerR3->idCpu = i;
                 pR0LoggerR3->fCreated = true;
                 pR0LoggerR3->fFlushingDisabled = false;
+
             }
 

trunk/src/VBox/VMM/VMMInternal.h

@@ -112 +112 @@
     bool                        fRegistered;
     bool                        a8Alignment;
-#if HC_ARCH_BITS == 32
+    /** The CPU ID. */
+    VMCPUID                     idCpu;
+#if HC_ARCH_BITS == 64
     uint32_t                    u32Alignment;
 #endif
@@ -558 +560 @@
 VMMR0DECL(void) vmmR0LoggerFlush(PRTLOGGER pLogger);
 
+/**
+ * Interal R0 logger worker: Custom prefix.
+ *
+ * @returns Number of chars written.
+ *
+ * @param   pLogger     The logger instance.
+ * @param   pchBuf      The output buffer.
+ * @param   cchBuf      The size of the buffer.
+ * @param   pvUser      User argument (ignored).
+ */
+VMMR0DECL(size_t) vmmR0LoggerPrefix(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser);
+
 #endif /* IN_RING0 */
 #ifdef IN_RC

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

@@ -1212 +1212 @@
 }
 
+/**
+ * Interal R0 logger worker: Custom prefix.
+ *
+ * @returns Number of chars written.
+ *
+ * @param   pLogger     The logger instance.
+ * @param   pchBuf      The output buffer.
+ * @param   cchBuf      The size of the buffer.
+ * @param   pvUser      User argument (ignored).
+ */
+VMMR0DECL(size_t) vmmR0LoggerPrefix(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser)
+{
+    NOREF(pvUser);
+#ifdef LOG_ENABLED
+    PVMMR0LOGGER pR0Logger = (PVMMR0LOGGER)((uintptr_t)pLogger - RT_OFFSETOF(VMMR0LOGGER, Logger));
+    if (    !VALID_PTR(pR0Logger)
+        ||  !VALID_PTR(pR0Logger + 1)
+        ||  pLogger->u32Magic != RTLOGGER_MAGIC
+        ||  cchBuf < 2)
+        return 0;
+
+    static const char s_szHex[17] = "0123456789abcdef";
+    VMCPUID const     idCpu       = pR0Logger->idCpu;
+    pchBuf[1] = s_szHex[ idCpu       & 15];
+    pchBuf[0] = s_szHex[(idCpu >> 4) & 15];
+
+    return 2;
+#else
+    return 0;
+#endif
+}
+
+
 #ifdef LOG_ENABLED
 /**