Changeset 624 in vbox

Timestamp:

Feb 5, 2007 10:03:11 AM (18 years ago)

Author:

vboxsync

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

18253

Message:

More statistics.

Location:

trunk/src/VBox/VMM

Files:

• TRPM.cpp (modified) (1 diff)
• TRPMInternal.h (modified) (1 diff)
• TRPMInternal.mac (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (5 diffs)
• VMMGC/TRPMGCHandlers.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/TRPM.cpp

@@ -510 +510 @@
     STAM_REG(pVM, &pVM->trpm.s.StatForwardFailGC,           STAMTYPE_COUNTER, "/TRPM/ForwardRaw/Fail/GC",             STAMUNIT_OCCURENCES, "Failure to forward interrupt in raw mode.");
     STAM_REG(pVM, &pVM->trpm.s.StatForwardFailHC,           STAMTYPE_COUNTER, "/TRPM/ForwardRaw/Fail/HC",             STAMUNIT_OCCURENCES, "Failure to forward interrupt in raw mode.");
+    STAM_REG(pVM, &pVM->trpm.s.StatForwardProfGC,       STAMTYPE_PROFILE_ADV, "/TRPM/ForwardRaw/Prof/GC",         STAMUNIT_TICKS_PER_CALL, "Profiling TRPMForwardTrap.");
+    STAM_REG(pVM, &pVM->trpm.s.StatForwardProfHC,       STAMTYPE_PROFILE_ADV, "/TRPM/ForwardRaw/Prof/HC",         STAMUNIT_TICKS_PER_CALL, "Profiling TRPMForwardTrap.");
 
     /*

trunk/src/VBox/VMM/TRPMInternal.h

@@ -157 +157 @@
     STAMCOUNTER     StatForwardFailHC;
 
+    STAMPROFILEADV  StatForwardProfGC;
+    STAMPROFILEADV  StatForwardProfHC;
+
     /* R3: Statistics for interrupt handlers (allocated on the hypervisor heap). */
     R3PTRTYPE(PSTAMCOUNTER) paStatForwardedIRQR3;

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -64 +64 @@
     .StatForwardFailHC        resb STAMCOUNTER_size
 
+    .StatForwardProfGC        resb STAMPROFILEADV_size
+    .StatForwardProfHC        resb STAMPROFILEADV_size
+
     .paStatForwardedIRQR3  RTR3PTR_RES 1
     .paStatForwardedIRQR0  RTR0PTR_RES 1

trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp

@@ -359 +359 @@
 TRPMDECL(int) TRPMForwardTrap(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t iGate, uint32_t opsize, TRPMERRORCODE enmError, TRPMEVENT enmType)
 {
+#ifdef TRPM_FORWARD_TRAPS_IN_GC
     X86EFLAGS eflags;
 
-#ifdef TRPM_FORWARD_TRAPS_IN_GC
+    STAM_PROFILE_ADV_START(CTXSUFF(&pVM->trpm.s.StatForwardProf), a);
+
     Log(("TRPMForwardTrap: eip=%VGv iGate=%d\n", pRegFrame->eip, iGate));
 
@@ -513 +515 @@
                     {
                         Log(("PGMPrefetchPage failed with rc=%Vrc\n", rc));
-                        return rc;
+                        goto failure;
                     }
 #ifdef IN_GC
@@ -665 +667 @@
                     eflags.Bits.u2IOPL = 0;
 
-                    STAM_COUNTER_INC(&pVM->trpm.s.CTXALLSUFF(paStatForwardedIRQ)[iGate]);
                     Assert(eflags.Bits.u1IF);
                     Assert(eflags.Bits.u2IOPL == 0);
+                    STAM_COUNTER_INC(&pVM->trpm.s.CTXALLSUFF(paStatForwardedIRQ)[iGate]);
+                    STAM_PROFILE_ADV_STOP(CTXSUFF(&pVM->trpm.s.StatForwardProf), a);
+
                     CPUMGCCallGuestTrapHandler(pRegFrame, GuestIdte.Gen.u16SegSel | 1, pVM->trpm.s.aGuestTrapHandler[iGate], eflags.u32, ss_r0, (RTGCPTR)esp_r0);
                     /* does not return */
@@ -681 +685 @@
                     pRegFrame->esp        = esp_r0;
                     pRegFrame->ss         = ss_r0 & ~X86_SEL_RPL;     /* set rpl to ring 0 */
+                    STAM_PROFILE_ADV_STOP(CTXSUFF(&pVM->trpm.s.StatForwardProf), a);
                     return VINF_SUCCESS;
 #endif
@@ -706 +711 @@
 failure:
     STAM_COUNTER_INC(&CTXSUFF(pVM->trpm.s.StatForwardFail));
+    STAM_PROFILE_ADV_STOP(CTXSUFF(&pVM->trpm.s.StatForwardProf), a);
 
     Log(("TRAP%02X: forwarding to REM (ss rpl=%d eflags=%08X VMIF=%d handler=%08X\n", iGate, pRegFrame->ss & X86_SEL_RPL, pRegFrame->eflags.u32, PATMAreInterruptsEnabledByCtxCore(pVM, pRegFrame), pVM->trpm.s.aGuestTrapHandler[iGate]));

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -521 +521 @@
                 }
             }
-            int rc = TRPMForwardTrap(pVM, pRegFrame, (uint32_t)pCpu->param1.parval, pCpu->opsize, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT);
+            rc = TRPMForwardTrap(pVM, pRegFrame, (uint32_t)pCpu->param1.parval, pCpu->opsize, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT);
             if (VBOX_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
                 return trpmGCExitTrap(pVM, VINF_SUCCESS, pRegFrame);
@@ -564 +564 @@
         {
             uint32_t cbIgnored;
-            int rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
+            rc = EMInterpretInstructionCPU(pVM, pCpu, pRegFrame, PC, &cbIgnored);
             if (VBOX_SUCCESS(rc))
                 pRegFrame->eip += pCpu->opsize;