Changeset 40517 in vbox for trunk

Timestamp:

Mar 17, 2012 7:30:54 PM (13 years ago)

Author:

vboxsync

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

76903

Message:

kBuild 2566 -> 2567: dtrace support.

Location:

trunk

Files:

• . (modified) (1 prop)
• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD.d (moved) (moved from trunk/src/VBox/Devices/build/VBoxDD-dtrace.d )
• src/VBox/VMM/Makefile.kmk (modified) (3 diffs)
• src/VBox/VMM/VMMR3/VBoxVMM.d (moved) (moved from trunk/src/VBox/VMM/VMMR3/VBoxVMM-dtrace.d )
• src/VBox/VMM/include/VMMTracing.h (modified) (1 diff)

trunk/Config.kmk

@@ -1430 +1430 @@
 endif
 
+ifdef VBOX_WITH_DTRACE_R3
+ USES += dtrace
+endif
+
 #
 # Compiler optimization flags.
@@ -3112 +3116 @@
 TEMPLATE_VBOXR3EXE_ASFLAGS.x86         = $(VBOX_ASFLAGS32)
 TEMPLATE_VBOXR3EXE_ASFLAGS.amd64       = $(VBOX_ASFLAGS64)
+ifdef VBOX_WITH_DTRACE_R3
+ TEMPLATE_VBOXR3EXE_DTRACETOOL         = StandardDTrace
+endif
 TEMPLATE_VBOXR3EXE_DEFS                = IN_RING3 $(ARCH_BITS_DEFS)
 TEMPLATE_VBOXR3EXE_LIBS.kprofile       = $(LIB_KPROFILE)

trunk/src/VBox/Devices/Makefile.kmk

@@ -229 +229 @@
 
  ifdef VBOX_WITH_DTRACE_R3
-  if1of ($(KBUILD_TARGET), solaris)
-   VBoxDD_SOURCES       += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o
-  endif
+  VBoxDD_USES           += dtrace
+  VBoxDD_SOURCES        += build/VBoxDD.d
  endif
 
@@ -471 +470 @@
 
  ifdef VBOX_WITH_DTRACE_R3
-  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_SUB_CURRENT)/build/VBoxDD-dtrace.d | $$(dir $$@)
-        dtrace -C -h -o $@ -s $<
-
-  if1of ($(KBUILD_TARGET), solaris)
-   DevicesR3_SOURCES      += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o
-   DevicesR3_CLEANS       += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o
-   $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.o: $(PATH_SUB_CURRENT)/build/VBoxDD-dtrace.d $$(filter-out %/VBoxDD-dtrace.o,$$(DevicesR3_2_OBJS)) | $$(dir $$@)
-        dtrace -C -G $(if-expr $(KBUILD_TARGET_ARCH) == amd64,-64,-32) -o $@ -s $< $(filter-out %/VBoxDD-dtrace.o,$(DevicesR3_2_OBJS))
-  endif
+  DevicesR3_DEFS        += VBOX_WITH_DTRACE
+  DevicesR3_USES        += dtrace
+  DevicesR3_SOURCES     += build/VBoxDD.d
  endif
 

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

@@ -32 +32 @@
 
 #ifdef VBOX_WITH_DTRACE
-# include "VBoxDD-dtrace.h"
+# include "dtrace/VBoxDD.h"
 #else
 # define VBOXDD_HGCMCALL_ENTER(a,b,c,d)             do { } while (0)

trunk/src/VBox/VMM/Makefile.kmk

@@ -219 +219 @@
 
 ifdef VBOX_WITH_DTRACE_R3
- VMMR3_DEFS += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3
- VMMR3_INCS          += $(VMMR3_0_OUTDIR)
- VMMR3_INTERMEDIATES += $(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.h
- VMMR3_CLEANS        += $(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 $<
-
- if1of ($(KBUILD_TARGET), solaris)
-  VMMR3_SOURCES      += $(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.o
-  VMMR3_CLEANS       += $(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.o
-  $$(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.o: $(PATH_SUB_CURRENT)/VMMR3/VBoxVMM-dtrace.d $$(filter-out %/VBoxVMM-dtrace.o,$$(VMMR3_2_OBJS)) | $$(dir $$@)
-        dtrace -C -G $(if-expr $(KBUILD_TARGET_ARCH) == amd64,-64,-32) -o $@ -s $< $(filter-out %/VBoxVMM-dtrace.o,$(VMMR3_2_OBJS))
- endif
+ VMMR3_USES       += dtrace
+ VMMR3_SOURCES    += VMMR3/VBoxVMM.d
 endif
 
@@ -269 +258 @@
 VBoxVMM_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMM.dylib
 VBoxVMM_LDFLAGS.solaris = -mimpure-text
+
+ifdef VBOX_WITH_DTRACE_R3
+ VBoxVMM_USES        += dtrace
+ VBoxVMM_SOURCES     += VMMR3/VBoxVMM.d
+endif
+
+
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
 # ifeq ($(KBUILD_HOST), linux)
@@ -274 +270 @@
 # endif
 #endif
-
-#ifdef VBOX_WITH_DTRACE_R3
-# if1of ($(KBUILD_TARGET), solaris)
-#  VBoxVMM_SOURCES      += $(VBoxVMM_0_OUTDIR)/VBoxVMM-dtrace.o
-#  VBoxVMM_CLEANS       += $(VBoxVMM_0_OUTDIR)/VBoxVMM-dtrace.o
-#  $$(VBoxVMM_0_OUTDIR)/VBoxVMM-dtrace.o: $(PATH_SUB_CURRENT)/VMMR3/VBoxVMM-dtrace.d $$(VMMR3_2_OBJS) | $$(dir $$@)
-#       dtrace -C -G $(if-expr $(KBUILD_TARGET_ARCH) == amd64,-64,-32) -o $@ -s $< $(VMMR3_2_OBJS)
-# endif
-#endif
-if1of ($(KBUILD_TARGET), solaris)
- VBoxVMM_SOURCES += $(VMMR3_0_OUTDIR)/VBoxVMM-dtrace.o
-endif
 
 

trunk/src/VBox/VMM/include/VMMTracing.h

@@ -67 +67 @@
 #ifdef IN_RING3
 # ifdef VBOX_WITH_DTRACE_R3
-#  include "VBoxVMM-dtrace.h"
+#  include "dtrace/VBoxVMM.h"
 
 # elif defined(DBGFTRACE_ENABLED)