Changeset 53867 in vbox

Timestamp:

Jan 20, 2015 1:52:38 PM (10 years ago)

Author:

vboxsync

Message:

Main: Added machine state change probe.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (3 diffs)
• src-all/VBoxAPI-start.d (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -314 +314 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_INCS) \
+       $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace \
         .
 VBoxSVC_INCS.win = \
@@ -654 +655 @@
         $(VBoxC_0_OUTDIR) \
         $(VBOX_MAIN_APIWRAPPER_INCS) \
-        $(dir $(VBOX_XML_SCHEMADEFS_H))
+        $(dir $(VBOX_XML_SCHEMADEFS_H)) \
+       $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace
 VBoxC_INCS.win      = \
         $(VBoxCOM_0_OUTDIR) \
@@ -830 +832 @@
  VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT $(VBoxC_DEFS)
  VBoxClient-x86_INST.win = $(INST_DLL)x86/
+ VBoxClient-x86_INCS = $(patsubst $(VBOX_MAIN_APIWRAPPER_DIR)%,$(VBOX_MAIN_APIWRAPPER_DIR)-x86%, $(VBoxC_INCS))
  VBoxClient-x86_INCS.win = \
         $(VBoxClient-x86_0_OUTDIR) \

trunk/src/VBox/Main/src-all/VBoxAPI-start.d

@@ -19 +19 @@
 {
     /* Manually defined probes: */
-
+    probe machine__state__changed(void *a_pMachine, int a_enmNewState, int a_enmOldState, const char *pszMachineUuid);
 
     /* The following probes are automatically generated and changes with the API: */

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -86 +86 @@
 
 #include <algorithm>
+
+#ifdef VBOX_WITH_DTRACE_R3_MAIN
+# include "dtrace/VBoxAPI.h"
+#endif
 
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
@@ -8318 +8322 @@
     i_ensureNoStateDependencies();
 
-    if (mData->mMachineState != aMachineState)
+    MachineState_T const enmOldState = mData->mMachineState;
+    if (enmOldState != aMachineState)
     {
         mData->mMachineState = aMachineState;
-
         RTTimeNow(&mData->mLastStateChange);
 
+#ifdef VBOX_WITH_DTRACE_R3_MAIN
+        VBOXAPI_MACHINE_STATE_CHANGED(this, aMachineState, enmOldState, mData->mUuid.toStringCurly().c_str());
+#endif
         mParent->i_onMachineStateChange(mData->mUuid, aMachineState);
     }