Index: /trunk/src/VBox/VMM/Makefile.kmk =================================================================== --- /trunk/src/VBox/VMM/Makefile.kmk (revision 40376) +++ /trunk/src/VBox/VMM/Makefile.kmk (revision 40377) @@ -219,8 +219,8 @@ ifdef VBOX_WITH_DTRACE_R3 - VMMR3_DEFS += VBOX_WITH_DTRACE + VMMR3_DEFS += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3 VMMR3_INCS += $(VMMR3_0_OUTDIR) - VMMR3_INTERMEDIATES += $(VMMR3_0_OUTDIR)/VBoxVMMR3-dtrace.h - $$(VMMR3_0_OUTDIR)/VBoxVMMR3-dtrace.h: $(PATH_SUB_CURRENT)/VBoxVMMR3-dtrace.d | $$(dir $$@) + VMMR3_INTERMEDIATES += $(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.h + $$(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.h: $(PATH_SUB_CURRENT)/VMMR3/VBoxVMM-dtrace.d | $$(dir $$@) dtrace -C -h -o $@ -s $< endif Index: unk/src/VBox/VMM/VBoxVMMR3-dtrace.d =================================================================== --- /trunk/src/VBox/VMM/VBoxVMMR3-dtrace.d (revision 40376) +++ (revision ) @@ -1,36 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxVMM - Static ring-3 dtrace probes. - */ - -/* - * Copyright (C) 2009-2012 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -provider vboxvmmr3 -{ - probe em__state__changed(void *a_pVCpu, int a_enmOldState, int a_enmNewState, int a_rc); - probe em__state__unchanged(void *a_pVCpu, int a_enmState, int a_rc); - probe em__raw__run__pre(void *a_pVCpu, void *a_pCtx); - probe em__raw__run__ret(void *a_pVCpu, void *a_pCtx, int a_rc); - probe em__raw__ff__high(void *a_pVCpu, unsigned int a_fGlobal, unsigned int a_fLocal, int a_rc); - probe em__raw__ff__all(void *a_pVCpu, unsigned int a_fGlobal, unsigned int a_fLocal, int a_rc); - probe em__raw__ff__all_ret(void *a_pVCpu, int a_rc); - probe em__raw__ff__raw(void *a_pVCpu, unsigned int a_fGlobal, unsigned int a_fLocal); - probe em__raw__ff__raw_ret(void *a_pVCpu, int a_rc); -}; - -#pragma D attributes Evolving/Evolving/Common provider vboxdd provider -#pragma D attributes Private/Private/Unknown provider vboxdd module -#pragma D attributes Private/Private/Unknown provider vboxdd function -#pragma D attributes Evolving/Evolving/Common provider vboxdd name -#pragma D attributes Evolving/Evolving/Common provider vboxdd args - Index: /trunk/src/VBox/VMM/VMMR3/EM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EM.cpp (revision 40376) +++ /trunk/src/VBox/VMM/VMMR3/EM.cpp (revision 40377) @@ -1103,5 +1103,5 @@ STAM_REL_PROFILE_ADV_SUSPEND(&pVCpu->em.s.StatREMTotal, a); rc = emR3ForcedActions(pVM, pVCpu, rc); - VBOXVMMR3_EM_FF_ALL_RET(pVCpu, rc); + VBOXVMM_EM_FF_ALL_RET(pVCpu, rc); STAM_REL_PROFILE_ADV_RESUME(&pVCpu->em.s.StatREMTotal, a); if ( rc != VINF_SUCCESS @@ -1331,5 +1331,5 @@ int emR3HighPriorityPostForcedActions(PVM pVM, PVMCPU pVCpu, int rc) { - VBOXVMMR3_EM_FF_HIGH(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions, rc); + VBOXVMM_EM_FF_HIGH(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions, rc); if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_PDM_CRITSECT)) @@ -1384,5 +1384,5 @@ rc = rc2; \ } while (0) - VBOXVMMR3_EM_FF_ALL(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions, rc); + VBOXVMM_EM_FF_ALL(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions, rc); /* @@ -1889,5 +1889,5 @@ { rc = emR3ForcedActions(pVM, pVCpu, rc); - VBOXVMMR3_EM_FF_ALL_RET(pVCpu, rc); + VBOXVMM_EM_FF_ALL_RET(pVCpu, rc); if ( ( rc == VINF_EM_RESCHEDULE_REM || rc == VINF_EM_RESCHEDULE_HWACC) @@ -2117,5 +2117,5 @@ if (enmOldState != enmNewState) { - VBOXVMMR3_EM_STATE_CHANGED(pVCpu, enmOldState, enmNewState, rc); + VBOXVMM_EM_STATE_CHANGED(pVCpu, enmOldState, enmNewState, rc); /* Clear MWait flags. */ @@ -2134,5 +2134,5 @@ } else - VBOXVMMR3_EM_STATE_UNCHANGED(pVCpu, enmNewState, rc); + VBOXVMM_EM_STATE_UNCHANGED(pVCpu, enmNewState, rc); STAM_PROFILE_ADV_STOP(&pVCpu->em.s.StatTotal, x); /* (skip this in release) */ Index: /trunk/src/VBox/VMM/VMMR3/EMHwaccm.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMHwaccm.cpp (revision 40376) +++ /trunk/src/VBox/VMM/VMMR3/EMHwaccm.cpp (revision 40377) @@ -585,5 +585,5 @@ { rc = emR3ForcedActions(pVM, pVCpu, rc); - VBOXVMMR3_EM_FF_ALL_RET(pVCpu, rc); + VBOXVMM_EM_FF_ALL_RET(pVCpu, rc); if ( rc != VINF_SUCCESS && rc != VINF_EM_RESCHEDULE_HWACC) Index: /trunk/src/VBox/VMM/VMMR3/EMRaw.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMRaw.cpp (revision 40376) +++ /trunk/src/VBox/VMM/VMMR3/EMRaw.cpp (revision 40377) @@ -173,5 +173,5 @@ { rc = emR3RawForcedActions(pVM, pVCpu, pCtx); - VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc); + VBOXVMM_EM_FF_RAW_RET(pVCpu, rc); if (rc != VINF_SUCCESS) return rc; @@ -1203,5 +1203,5 @@ { int rc = emR3RawForcedActions(pVM, pVCpu, pVCpu->em.s.pCtx); - VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc); + VBOXVMM_EM_FF_RAW_RET(pVCpu, rc); return rc; } @@ -1225,5 +1225,5 @@ * Also note that SELMR3UpdateFromCPUM may trigger VM_FF_SELM_SYNC_TSS. */ - VBOXVMMR3_EM_FF_RAW(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions); + VBOXVMM_EM_FF_RAW(pVCpu, pVM->fGlobalForcedActions, pVCpu->fLocalForcedActions); /* @@ -1388,5 +1388,5 @@ { rc = emR3RawForcedActions(pVM, pVCpu, pCtx); - VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc); + VBOXVMM_EM_FF_RAW_RET(pVCpu, rc); if (rc != VINF_SUCCESS) break; @@ -1419,5 +1419,5 @@ { rc = emR3RawForcedActions(pVM, pVCpu, pCtx); - VBOXVMMR3_EM_FF_RAW_RET(pVCpu, rc); + VBOXVMM_EM_FF_RAW_RET(pVCpu, rc); if (rc != VINF_SUCCESS) { @@ -1453,7 +1453,7 @@ { STAM_PROFILE_START(&pVCpu->em.s.StatRAWExec, c); - VBOXVMMR3_EM_RAW_RUN_PRE(pVCpu, pCtx); + VBOXVMM_EM_RAW_RUN_PRE(pVCpu, pCtx); rc = VMMR3RawRunGC(pVM, pVCpu); - VBOXVMMR3_EM_RAW_RUN_RET(pVCpu, pCtx, rc); + VBOXVMM_EM_RAW_RUN_RET(pVCpu, pCtx, rc); STAM_PROFILE_STOP(&pVCpu->em.s.StatRAWExec, c); } @@ -1553,5 +1553,5 @@ STAM_REL_PROFILE_ADV_SUSPEND(&pVCpu->em.s.StatRAWTotal, a); rc = emR3ForcedActions(pVM, pVCpu, rc); - VBOXVMMR3_EM_FF_ALL_RET(pVCpu, rc); + VBOXVMM_EM_FF_ALL_RET(pVCpu, rc); STAM_REL_PROFILE_ADV_RESUME(&pVCpu->em.s.StatRAWTotal, a); if ( rc != VINF_SUCCESS Index: /trunk/src/VBox/VMM/VMMR3/VBoxVMM-dtrace.d =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VBoxVMM-dtrace.d (revision 40377) +++ /trunk/src/VBox/VMM/VMMR3/VBoxVMM-dtrace.d (revision 40377) @@ -0,0 +1,36 @@ +/* $Id$ */ +/** @file + * VBoxVMM - Static ring-3 dtrace probes. + */ + +/* + * Copyright (C) 2009-2012 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +provider vboxvmm +{ + probe em__state__changed(void *a_pVCpu, int a_enmOldState, int a_enmNewState, int a_rc); + probe em__state__unchanged(void *a_pVCpu, int a_enmState, int a_rc); + probe em__raw__run__pre(void *a_pVCpu, void *a_pCtx); + probe em__raw__run__ret(void *a_pVCpu, void *a_pCtx, int a_rc); + probe em__ff__high(void *a_pVCpu, unsigned int a_fGlobal, unsigned int a_fLocal, int a_rc); + probe em__ff__all(void *a_pVCpu, unsigned int a_fGlobal, unsigned int a_fLocal, int a_rc); + probe em__ff__all_ret(void *a_pVCpu, int a_rc); + probe em__ff__raw(void *a_pVCpu, unsigned int a_fGlobal, unsigned int a_fLocal); + probe em__ff__raw_ret(void *a_pVCpu, int a_rc); +}; + +#pragma D attributes Evolving/Evolving/Common provider vboxvmm provider +#pragma D attributes Private/Private/Unknown provider vboxvmm module +#pragma D attributes Private/Private/Unknown provider vboxvmm function +#pragma D attributes Evolving/Evolving/Common provider vboxvmm name +#pragma D attributes Evolving/Evolving/Common provider vboxvmm args + Index: /trunk/src/VBox/VMM/include/VMMTracing.h =================================================================== --- /trunk/src/VBox/VMM/include/VMMTracing.h (revision 40376) +++ /trunk/src/VBox/VMM/include/VMMTracing.h (revision 40377) @@ -49,36 +49,37 @@ #ifdef IN_RING3 # ifdef VBOX_WITH_DTRACE_R3 -# include "VBoxVMMR3-dtrace.h" +# include "VBoxVMM-dtrace.h" # elif defined(DBGFTRACE_ENABLED) -# define VBOXVMMR3_EM_STATE_CHANGED(a_pVCpu, a_enmOldState, a_enmNewState, a_rc) \ +# error +# 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) -# define VBOXVMMR3_EM_STATE_UNCHANGED(a_pVCpu, a_enmState, 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) -# define VBOXVMMR3_EM_RAW_RUN_PRE(a_pVCpu, a_pCtx) \ +# 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) -# define VBOXVMMR3_EM_RAW_RUN_RET(a_pVCpu, a_pCtx, a_rc) \ +# 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)) -# define VBOXVMMR3_EM_FF_HIGH(a_pVCpu, a_fGlobal, a_fLocal, 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)) -# define VBOXVMMR3_EM_FF_ALL(a_pVCpu, 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)) -# define VBOXVMMR3_EM_FF_ALL_RET(a_pVCpu, 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)) -# define VBOXVMMR3_EM_FF_RAW(a_pVCpu, a_fGlobal, a_fLocal) \ +# 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)) -# define VBOXVMMR3_EM_FF_RAW_RET(a_pVCpu, a_rc) \ +# define VBOXVMM_EM_FF_RAW_RET(a_pVCpu, a_rc) \ RTTraceBufAddMsgF(VMCPU_TO_HTB(a_pVCpu), "em-ff-raw-ret %d", (a_rc)) # else -# define VBOXVMMR3_EM_STATE_CHANGED(a_pVCpu, a_enmOldState, a_enmNewState, a_rc) do { } while (0) -# define VBOXVMMR3_EM_STATE_UNCHANGED(a_pVCpu, a_enmState, a_rc) do { } while (0) -# define VBOXVMMR3_EM_RAW_RUN_PRE(a_pVCpu, a_pCtx) do { } while (0) -# define VBOXVMMR3_EM_RAW_RUN_RET(a_pVCpu, a_pCtx, a_rc) do { } while (0) -# define VBOXVMMR3_EM_FF_HIGH(a_pVCpu, a_fGlobal, a_fLocal, a_rc) do { } while (0) -# define VBOXVMMR3_EM_FF_ALL(a_pVCpu, a_fGlobal, a_fLocal, a_rc) do { } while (0) -# define VBOXVMMR3_EM_FF_ALL_RET(a_pVCpu, a_rc) do { } while (0) -# define VBOXVMMR3_EM_FF_RAW(a_pVCpu, a_fGlobal, a_fLocal) do { } while (0) -# define VBOXVMMR3_EM_FF_RAW_RET(a_pVCpu, a_rc) do { } while (0) +# define VBOXVMM_EM_STATE_CHANGED(a_pVCpu, a_enmOldState, a_enmNewState, a_rc) do { } while (0) +# define VBOXVMM_EM_STATE_UNCHANGED(a_pVCpu, a_enmState, a_rc) do { } while (0) +# define VBOXVMM_EM_RAW_RUN_PRE(a_pVCpu, a_pCtx) do { } while (0) +# define VBOXVMM_EM_RAW_RUN_RET(a_pVCpu, a_pCtx, a_rc) do { } while (0) +# define VBOXVMM_EM_FF_HIGH(a_pVCpu, a_fGlobal, a_fLocal, a_rc) do { } while (0) +# define VBOXVMM_EM_FF_ALL(a_pVCpu, a_fGlobal, a_fLocal, a_rc) do { } while (0) +# define VBOXVMM_EM_FF_ALL_RET(a_pVCpu, a_rc) do { } while (0) +# define VBOXVMM_EM_FF_RAW(a_pVCpu, a_fGlobal, a_fLocal) do { } while (0) +# define VBOXVMM_EM_FF_RAW_RET(a_pVCpu, a_rc) do { } while (0) # endif