Changeset 40375 in vbox for trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

Timestamp:

Mar 6, 2012 1:37:23 PM (13 years ago)

Author:

vboxsync

Message:

VMM: flow tracing.

File:

• trunk/src/VBox/VMM/VMMR3/EMRaw.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include <VBox/vmm/iom.h>
 #include <VBox/vmm/dbgf.h>
-#include <VBox/vmm/dbgftrace.h>
 #include <VBox/vmm/pgm.h>
 #ifdef VBOX_WITH_REM
@@ -49 +48 @@
 #include <VBox/disopcode.h>
 #include <VBox/vmm/dbgf.h>
+#include "VMMTracing.h"
 
 #include <VBox/log.h>
@@ -173 +173 @@
         {
             rc = emR3RawForcedActions(pVM, pVCpu, pCtx);
+            VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc);
             if (rc != VINF_SUCCESS)
                 return rc;
@@ -1201 +1202 @@
 VMMR3DECL(int) EMR3CheckRawForcedActions(PVM pVM, PVMCPU pVCpu)
 {
-    return emR3RawForcedActions(pVM, pVCpu, pVCpu->em.s.pCtx);
+    int rc = emR3RawForcedActions(pVM, pVCpu, pVCpu->em.s.pCtx);
+    VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc);
+    return rc;
 }
 
@@ -1222 +1225 @@
      * Also note that SELMR3UpdateFromCPUM may trigger VM_FF_SELM_SYNC_TSS.
      */
-
+    VBOXVMMR3_EM_FF_RAW(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions);
 
     /*
@@ -1384 +1387 @@
             ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HIGH_PRIORITY_PRE_RAW_MASK))
         {
-#ifdef DBGFTRACE_ENABLED
-            RTTraceBufAddMsgF(pVM->CTX_SUFF(hTraceBuf), "em-raw ff %08x/%08x pre", pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions);
-#endif
             rc = emR3RawForcedActions(pVM, pVCpu, pCtx);
+            VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc);
             if (rc != VINF_SUCCESS)
                 break;
@@ -1418 +1419 @@
             {
                 rc = emR3RawForcedActions(pVM, pVCpu, pCtx);
+                VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc);
                 if (rc != VINF_SUCCESS)
                 {
@@ -1451 +1453 @@
         {
             STAM_PROFILE_START(&pVCpu->em.s.StatRAWExec, c);
+            VBOXVMMR3_EM_RAW_RUN_PRE(pVCpu, pCtx);
             rc = VMMR3RawRunGC(pVM, pVCpu);
+            VBOXVMMR3_EM_RAW_RUN_RET(pVCpu, pCtx, rc);
             STAM_PROFILE_STOP(&pVCpu->em.s.StatRAWExec, c);
-#ifdef DBGFTRACE_ENABLED
-            RTTraceBufAddMsgF(pVM->CTX_SUFF(hTraceBuf), "em-raw run => %d", rc);
-#endif
         }
         else
@@ -1549 +1550 @@
         {
             Assert(pCtx->eflags.Bits.u1VM || (pCtx->ss & X86_SEL_RPL) != 1);
-#ifdef DBGFTRACE_ENABLED
-            RTTraceBufAddMsgF(pVM->CTX_SUFF(hTraceBuf), "em-raw ff %08x/%08x post", pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions);
-#endif
 
             STAM_REL_PROFILE_ADV_SUSPEND(&pVCpu->em.s.StatRAWTotal, a);
             rc = emR3ForcedActions(pVM, pVCpu, rc);
+            VBOXVMMR3_EM_FF_ALL_RET(pVCpu, rc);
             STAM_REL_PROFILE_ADV_RESUME(&pVCpu->em.s.StatRAWTotal, a);
             if (    rc != VINF_SUCCESS