Changeset 40397 in vbox for trunk

Timestamp:

Mar 7, 2012 9:52:38 PM (13 years ago)

Author:

vboxsync

Message:

VMM: Make most of the tracing optional so we don't have to be afraid of adding lots more.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• src/VBox/VMM/include/VMMTracing.h (modified) (3 diffs)

trunk/include/VBox/vmm/vm.h

@@ -94 +94 @@
     /** Ring-0 Host Context VM Pointer. */
     PVMR0                   pVMR0;
+    /** Flag indicating that tracing is enabled.  */
+    bool                    fTracingEnabled;
     /** Alignment padding. */
-    RTR0PTR                 pvR0Padding;
+    uint8_t                 abAlignment0[HC_ARCH_BITS == 32 ? 3 : 7];
     /** Raw-mode Context VM Pointer. */
     PVMRC                   pVMRC;

trunk/include/VBox/vmm/vm.mac

@@ -121 +121 @@
     .pVMR3                  RTR3PTR_RES 1
     .pVMR0                  RTR0PTR_RES 1
-    .pvR0Padding            RTR0PTR_RES 1
+    .fTracingEnabled        resb 1
+%if HC_ARCH_BITS == 32
+    .abAlignment0           resb 3
+%else
+    .abAlignment0           resb 7
+%endif
     .pVMRC                  RTRCPTR_RES 1
     .idCpu                  resd 1

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

@@ -43 +43 @@
 #define VM_TO_HTB(a_pVM)          ((a_pVM)->CTX_SUFF(hTraceBuf))
 
+/** Macro wrapper for trace points that are disabled by default. */
+#define TP_COND_VMCPU(a_pVCpu, a_TraceStmt) \
+    do { \
+        if (RT_UNLIKELY((a_pVCpu)->fTracingEnabled)) \
+        { \
+            RTTRACEBUF const hTB = (a_pVCpu)->CTX_SUFF(pVM)->CTX_SUFF(hTraceBuf); \
+            a_TraceStmt; \
+        } \
+    } while (0)
+
+
+
 
 /** @name Ring-3 trace points.
@@ -53 +65 @@
 # elif defined(DBGFTRACE_ENABLED)
 #  define VBOXVMM_EM_STATE_CHANGED(a_pVCpu, a_enmOldState, a_enmNewState, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-state-changed %d -> %d (rc=%d)", a_enmOldState, a_enmNewState, a_rc)
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-state-changed %d -> %d (rc=%d)", a_enmOldState, a_enmNewState, a_rc))
 #  define VBOXVMM_EM_STATE_UNCHANGED(a_pVCpu, a_enmState, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-state-unchanged %d (rc=%d)", a_enmState, a_rc)
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-state-unchanged %d (rc=%d)", a_enmState, a_rc))
 #   define VBOXVMM_EM_RAW_RUN_PRE(a_pVCpu, a_pCtx) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-raw-pre %04x:%08llx", (a_pCtx)->cs, (a_pCtx)->rip)
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-raw-pre %04x:%08llx", (a_pCtx)->cs, (a_pCtx)->rip))
 #   define VBOXVMM_EM_RAW_RUN_RET(a_pVCpu, a_pCtx, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-raw-ret %04x:%08llx rc=%d", (a_pCtx)->cs, (a_pCtx)->rip, (a_rc))
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-raw-ret %04x:%08llx rc=%d", (a_pCtx)->cs, (a_pCtx)->rip, (a_rc)))
 #   define VBOXVMM_EM_FF_HIGH(a_pVCpu, a_fGlobal, a_fLocal, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-ff-high vm=%#x cpu=%#x rc=%d", (a_fGlobal), (a_fLocal), (a_rc))
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-ff-high vm=%#x cpu=%#x rc=%d", (a_fGlobal), (a_fLocal), (a_rc)))
 #   define VBOXVMM_EM_FF_ALL(a_pVCpu, a_fGlobal, a_fLocal, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-ff-all vm=%#x cpu=%#x rc=%d", (a_fGlobal), (a_fLocal), (a_rc))
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-ff-all vm=%#x cpu=%#x rc=%d", (a_fGlobal), (a_fLocal), (a_rc)))
 #   define VBOXVMM_EM_FF_ALL_RET(a_pVCpu, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-ff-all-ret %d", (a_rc))
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-ff-all-ret %d", (a_rc)))
 #   define VBOXVMM_EM_FF_RAW(a_pVCpu, a_fGlobal, a_fLocal) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-ff-raw vm=%#x cpu=%#x", (a_fGlobal), (a_fLocal))
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-ff-raw vm=%#x cpu=%#x", (a_fGlobal), (a_fLocal)))
 #   define VBOXVMM_EM_FF_RAW_RET(a_pVCpu, a_rc) \
-        RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-ff-raw-ret %d", (a_rc))
+        TP_COND_VMCPU(a_pVCpu, RTTraceBufAddMsgF(hTB, "em-ff-raw-ret %d", (a_rc)))
 
 # else
@@ -84 +96 @@
 # endif
 #endif  /* IN_RING3 */
+/** @} */