Changeset 21561 in vbox

Timestamp:

Jul 14, 2009 12:27:26 AM (16 years ago)

Author:

vboxsync

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

50036

Message:

Devices: Finally adding the first dtrace probes. :-)

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (3 diffs)
• VMMDev/VMMDevHGCM.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -123 +123 @@
 #
 VBoxDD_TEMPLATE         = VBOXR3
+ifdef VBOX_WITH_DTRACE_R3
+ VBoxDD_TEMPLATE        = VBOXR3OSX105
+endif
 VBoxDD_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
 VBoxDD_SOURCES          = \
@@ -264 +267 @@
 DevicesR3_DEFS         += VBOX_HGCM_HOST_CODE \
                           $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
-DevicesR3_INCS         := \
-        $(PATH_SUB_CURRENT)
+DevicesR3_DEFS         += VBOX_WITH_HGCM
+DevicesR3_DEFS.linux   += _GNU_SOURCE
+DevicesR3_DEFS.l4      += _GNU_SOURCE
+
+DevicesR3_INCS          = \
+        .
+
 DevicesR3_SOURCES       = \
         Input/DevPS2.cpp \
@@ -410 +418 @@
 endif
 
-DevicesR3_DEFS         += VBOX_WITH_HGCM
-DevicesR3_DEFS.linux   += _GNU_SOURCE
-DevicesR3_DEFS.l4      += _GNU_SOURCE
+ifdef VBOX_WITH_DTRACE_R3
+ DevicesR3_TEMPLATE    = VBOXR3OSX105
+ DevicesR3_DEFS        += VBOX_WITH_DTRACE
+ DevicesR3_INCS        += $(DevicesR3_0_OUTDIR)
+ DevicesR3_INTERMEDIATES += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h
+ $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h: $(PATH_CURRENT)/VBoxDD-dtrace.d | $$(dir $$@)
+        dtrace -C -h -o $@ -s $<
+endif
 
 ifdef VBOX_WITH_DYNAMIC_DSDT
-DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxdsl.hex
-PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxdsl.hex
-
-$$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
+ DevicesR3_CLEAN       += $(PATH_DevicesR3)/vboxdsl.hex
+ PC/ACPI/VBoxAcpi.cpp_DEPS = $(PATH_DevicesR3)/vboxdsl.hex
+
+ $$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
         $(call MSG_TOOL,bin2c,DevicesR3,$<,$@)
         $(QUIET)$(VBOX_BIN2C) -export VboxDslSource $< $@
 
-vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
-
-else
-# VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
-DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
-PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxaml.hex
-
-$$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
+ vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
+
+else  # !VBOX_WITH_DYNAMIC_DSDT
+ # VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
+ DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
+ PC/ACPI/VBoxAcpi.cpp_DEPS = $(PATH_DevicesR3)/vboxaml.hex
+
+ $$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
         $(call MSG_TOOL,iasl,DevicesR3,$<,$@)
         $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
 
-vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
-
-endif
-PC/ACPI/VBoxAcpi.cpp_INCS     = $(PATH_DevicesR3)
+ vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
+
+endif # !VBOX_WITH_DYNAMIC_DSDT
+PC/ACPI/VBoxAcpi.cpp_INCS = $(PATH_DevicesR3)
 
 # For finding PCIInternal.h from VBox/pci.h.

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -35 +35 @@
 #include "VMMDevHGCM.h"
 
+#ifdef VBOX_WITH_DTRACE
+# include "VBoxDD-dtrace.h"
+#else
+# define VBOXDD_HGCMCALL_ENTER(a,b,c,d)             do { } while (0)
+# define VBOXDD_HGCMCALL_COMPLETED_REQ(a,b)         do { } while (0)
+# define VBOXDD_HGCMCALL_COMPLETED_EMT(a,b)         do { } while (0)
+# define VBOXDD_HGCMCALL_COMPLETED_DONE(a,b,c,d)    do { } while (0)
+#endif
+
 typedef enum _VBOXHGCMCMDTYPE
 {
@@ -724 +733 @@
         pCmd->paLinPtrs = NULL;
     }
+
+    VBOXDD_HGCMCALL_ENTER(pCmd, pHGCMCall->u32Function, pHGCMCall->u32ClientID, cbCmdSize);
 
     /* Process parameters, changing them to host context pointers for easy
@@ -1571 +1582 @@
 {
     VMMDevState *pVMMDevState = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
+#ifdef VBOX_WITH_DTRACE
+    uint32_t idFunction = 0;
+    uint32_t idClient   = 0;
+#endif
 
     int rc = VINF_SUCCESS;
@@ -1593 +1608 @@
      * back to guest memory.
      */
+    VBOXDD_HGCMCALL_COMPLETED_EMT(pCmd, result);
     vmmdevHGCMRemoveCommand (pVMMDevState, pCmd);
 
@@ -1752 +1768 @@
                     }
                 }
+# ifdef VBOX_WITH_DTRACE
+                idFunction = pHGCMCall->u32Function;
+                idClient   = pHGCMCall->u32ClientID;
+# endif
                 break;
             }
@@ -1850 +1870 @@
                     }
                 }
+# ifdef VBOX_WITH_DTRACE
+                idFunction = pHGCMCall->u32Function;
+                idClient   = pHGCMCall->u32ClientID;
+# endif
                 break;
             }
@@ -1948 +1972 @@
                     }
                 }
+# ifdef VBOX_WITH_DTRACE
+                idFunction = pHGCMCall->u32Function;
+                idClient   = pHGCMCall->u32ClientID;
+# endif
                 break;
             }
@@ -1996 +2024 @@
     RTMemFree (pCmd);
 
+    VBOXDD_HGCMCALL_COMPLETED_DONE(pCmd, idFunction, idClient, result);
     return;
 }
@@ -2002 +2031 @@
 {
     VMMDevState *pVMMDevState = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
+
+    VBOXDD_HGCMCALL_COMPLETED_REQ(pCmd, result);
 
 /** @todo no longer necessary to forward to EMT, but it might be more