Changeset 19732 in vbox for trunk/src

Timestamp:

May 15, 2009 12:29:52 PM (16 years ago)

Author:

vboxsync

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

47350

Message:

Ring 0 logger changes.

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (7 diffs)
• VMMInternal.h (modified) (3 diffs)
• VMMR0/VMMR0.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -463 +463 @@
     Assert(pVCpu && pVCpu->idCpu == 0);
 
+#ifdef LOG_ENABLED
     /*
      * Initialize the ring-0 logger if we haven't done so yet.
@@ -473 +474 @@
             return rc;
     }
+#endif
 
     /*
@@ -485 +487 @@
         rc = SUPCallVMMR0Ex(pVM->pVMR0, 0 /* VCPU 0 */, VMMR0_DO_VMMR0_INIT, VMMGetSvnRev(), NULL);
 #endif
+        /*
+         * Flush the logs.
+         */
+#ifdef LOG_ENABLED
         if (    pVCpu->vmm.s.pR0LoggerR3
             &&  pVCpu->vmm.s.pR0LoggerR3->Logger.offScratch > 0)
             RTLogFlushToLogger(&pVCpu->vmm.s.pR0LoggerR3->Logger, NULL);
+#endif
         if (rc != VINF_VMM_CALL_HOST)
             break;
@@ -607 +614 @@
         rc = SUPCallVMMR0Ex(pVM->pVMR0, 0 /* VCPU 0 */, VMMR0_DO_VMMR0_TERM, 0, NULL);
 #endif
+        /*
+         * Flush the logs.
+         */
+#ifdef LOG_ENABLED
         if (    pVCpu->vmm.s.pR0LoggerR3
             &&  pVCpu->vmm.s.pR0LoggerR3->Logger.offScratch > 0)
             RTLogFlushToLogger(&pVCpu->vmm.s.pR0LoggerR3->Logger, NULL);
+#endif
         if (rc != VINF_VMM_CALL_HOST)
             break;
@@ -755 +767 @@
 #endif /* VBOX_WITH_RC_RELEASE_LOGGING */
 
+#ifdef LOG_ENABLED
     /*
      * For the ring-0 EMT logger, we use a per-thread logger instance
@@ -787 +800 @@
         }
     }
+#endif
     return rc;
 }
@@ -1444 +1458 @@
         rc = SUPCallVMMR0Ex(pVM->pVMR0, pVCpu->idCpu, uOperation, u64Arg, pReqHdr);
 #endif
+        /*
+         * Flush the logs.
+         */
+#ifdef LOG_ENABLED
         if (    pVCpu->vmm.s.pR0LoggerR3
             &&  pVCpu->vmm.s.pR0LoggerR3->Logger.offScratch > 0)
             RTLogFlushToLogger(&pVCpu->vmm.s.pR0LoggerR3->Logger, NULL);
+#endif
         if (rc != VINF_VMM_CALL_HOST)
             break;

trunk/src/VBox/VMM/VMMInternal.h

@@ -103 +103 @@
     /** Flag indicating whether we've disabled flushing (world switch) or not. */
     bool                        fFlushingDisabled;
+    /** Flag indicating whether we've registered the instance already. */
+    bool                        fRegistered;
+    bool                        a8Alignment;
 #if HC_ARCH_BITS == 32
     uint32_t                    u32Alignment;
@@ -341 +344 @@
     RCPTRTYPE(uint8_t *)        pbEMTStackBottomRC;
 
+#ifdef LOG_ENABLED
     /** Pointer to the R0 logger instance - R3 Ptr.
      * This is NULL if logging is disabled. */
@@ -347 +351 @@
      * This is NULL if logging is disabled. */
     R0PTRTYPE(PVMMR0LOGGER)     pR0LoggerR0;
+#endif
 
     /** @name CallHost

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

@@ -188 +188 @@
         return VERR_INVALID_PARAMETER;
 
+#ifdef LOG_ENABLED
     /*
      * Register the EMT R0 logger instance for VCPU 0.
@@ -196 +197 @@
     if (pR0Logger)
     {
-#if 0 /* testing of the logger. */
+# if 0 /* testing of the logger. */
         LogCom(("vmmR0InitVM: before %p\n", RTLogDefaultInstance()));
         LogCom(("vmmR0InitVM: pfnFlush=%p actual=%p\n", pR0Logger->Logger.pfnFlush, vmmR0LoggerFlush));
@@ -204 +205 @@
         RTLogSetDefaultInstanceThread(&pR0Logger->Logger, (uintptr_t)pVM->pSession);
         LogCom(("vmmR0InitVM: after %p reg\n", RTLogDefaultInstance()));
-        RTLogSetDefaultInstanceThread(NULL, 0);
+        RTLogSetDefaultInstanceThread(NULL, pVM->pSession);
         LogCom(("vmmR0InitVM: after %p dereg\n", RTLogDefaultInstance()));
 
@@ -216 +217 @@
         pR0Logger->Logger.pfnLogger("hello ring-0 logger\n");
         LogCom(("vmmR0InitVM: returned succesfully from direct logger call (2). offScratch=%d\n", pR0Logger->Logger.offScratch));
-        RTLogSetDefaultInstanceThread(NULL, 0);
+        RTLogSetDefaultInstanceThread(NULL, pVM->pSession);
         LogCom(("vmmR0InitVM: after %p dereg2\n", RTLogDefaultInstance()));
 
@@ -225 +226 @@
         RTLogPrintf("hello ring-0 logger (RTLogPrintf)\n");
         LogCom(("vmmR0InitVM: RTLogPrintf returned fine offScratch=%d\n", pR0Logger->Logger.offScratch));
-#endif
+# endif
         Log(("Switching to per-thread logging instance %p (key=%p)\n", &pR0Logger->Logger, pVM->pSession));
         RTLogSetDefaultInstanceThread(&pR0Logger->Logger, (uintptr_t)pVM->pSession);
-    }
+        pR0Logger->fRegistered = true;
+    }
+#endif /* LOG_ENABLED */
 
     /*
@@ -261 +264 @@
         }
     }
-    RTLogSetDefaultInstanceThread(NULL, 0);
+    RTLogSetDefaultInstanceThread(NULL, (uintptr_t)pVM->pSession);
     return rc;
 }
@@ -295 +298 @@
      * Deregister the logger.
      */
-    RTLogSetDefaultInstanceThread(NULL, 0);
+    RTLogSetDefaultInstanceThread(NULL, (uintptr_t)pVM->pSession);
     return VINF_SUCCESS;
 }
@@ -626 +629 @@
             ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
 
+#ifdef LOG_ENABLED
+            if (pVCpu->idCpu > 0)
+            {
+                /* Lazy registration of ring 0 loggers. */
+                PVMMR0LOGGER pR0Logger = pVCpu->vmm.s.pR0LoggerR0;
+                if (    pR0Logger
+                    &&  !pR0Logger->fRegistered)
+                {
+                    RTLogSetDefaultInstanceThread(&pR0Logger->Logger, (uintptr_t)pVM->pSession);
+                    pR0Logger->fRegistered = true;
+                }
+            }
+#endif
             if (!HWACCMR0SuspendPending())
             {
@@ -764 +780 @@
             if (!pVM)
                 return VERR_INVALID_PARAMETER;
-
-#ifdef LOG_ENABLED
-            /* Register the ring 0 logger for this thread here as well. */
-            PVMCPU       pVCpu = &pVM->aCpus[idCpu];
-            PVMMR0LOGGER pR0Logger = pVCpu->vmm.s.pR0LoggerR0;
-            if (pR0Logger)
-                RTLogSetDefaultInstanceThread(&pR0Logger->Logger, (uintptr_t)pVM->pSession);
-#endif
             return GVMMR0RegisterVCpu(pVM, idCpu);
         }
@@ -1140 +1148 @@
 }
 
-
+#ifdef LOG_ENABLED
 /**
  * Internal R0 logger worker: Flush logger.
@@ -1196 +1204 @@
     VMMR0CallHost(pVM, VMMCALLHOST_VMM_LOGGER_FLUSH, 0);
 }
-
-
+#endif
+
+#ifdef LOG_ENABLED
 /**
  * Disables flushing of the ring-0 debug log.
@@ -1222 +1231 @@
         pVCpu->vmm.s.pR0LoggerR0->fFlushingDisabled = false;
 }
-
+#endif
 
 /**