Changeset 53974 in vbox

Timestamp:

Jan 27, 2015 5:50:17 PM (10 years ago)

Author:

vboxsync

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

97876

Message:

VBoxDTrace: Morphing it into an extension pack, adding a wrapper binary, VBoxDTrace, that calls dtrace or the extension pack depending on what it finds. Build fixes for recent linux.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml (added)
• src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk (moved) (moved from trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTrace/Makefile.kmk ) (6 diffs)
• src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0 (deleted)
• src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp (copied) (copied from trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp )
• src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm (copied) (copied from trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0A.asm )
• src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp (added)
• src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h (modified) (1 diff)
• src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h (modified) (3 diffs)
• src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c (modified) (4 diffs)

trunk/Config.kmk

@@ -8 +8 @@
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -61 +61 @@
 PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
 
-# Misc names used bye the install paths below.
+# Misc names used by the install paths below.
 VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
+VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME := Oracle_VBoxDTrace_Extension_Pack
 
 # Install paths
@@ -145 +146 @@
 INST_EXTPACK_CERTS    = $(INST_BIN)ExtPackCertificates/
 INST_EXTPACK_PUEL     = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
+INST_EXTPACK_VBOXDTRACE = $(INST_EXTPACK)$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)/
 INST_PACKAGES         = packages/
 
@@ -694 +696 @@
 # Enable the VNC server extension pack (GPL only).
 #VBOX_WITH_EXTPACK_VNC = 1
+# Enables the VBoxDTrace extension pack.
+VBOX_WITH_EXTPACK_VBOXDTRACE = 1
 ## @}
 
@@ -4880 +4884 @@
   TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
   TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
-endif
+ endif
+
+ # For each individual extension pack
+ ifdef VBOX_WITH_EXTPACK_VBOXDTRACE
+  TEMPLATE_VBoxR3ExtPackDTrace = For the ring-3 context modules in the VBoxDTrace extension pack.
+  TEMPLATE_VBoxR3ExtPackDTrace_EXTENDS = VBoxR3ExtPack
+  TEMPLATE_VBoxR3ExtPackDTrace_INST = $(INST_EXTPACK_VBOXDTRACE)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+
+  TEMPLATE_VBoxR0ExtPackDTrace = For the ring-0 context modules in the VBoxDTrace extension pack.
+  TEMPLATE_VBoxR0ExtPackDTrace_EXTENDS = VBoxR0ExtPack
+  TEMPLATE_VBoxR0ExtPackDTrace_INST = $(INST_EXTPACK_VBOXDTRACE)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+
+  TEMPLATE_VBoxInsExtPackDTrace = For the install targets for the VBoxDTrace extension pack.
+  TEMPLATE_VBoxInsExtPackDTrace_EXTENDS = VBoxR0ExtPack
+  TEMPLATE_VBoxInsExtPackDTrace_INST = $(INST_EXTPACK_VBOXDTRACE)
+endif
+
 endif # VBOX_WITH_EXTPACK
 

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-makefile for VBoxDTraceR0.
+# Sub-makefile for VBoxDTrace.
 #
 # Contributed by: bird
@@ -18 +18 @@
 #
 
-SUB_DEPTH = ../../../../../
+SUB_DEPTH = ../../../../
 include $(KBUILD_PATH)/subheader.kmk
 
+
+#
+# The generic wrapper that selects native or extpack dtrace cmd and adds our
+# library path to the command line.
+#
+# Note! This is not installed as part of the extension pack, but always shipped
+#       with the base VBox installation.
+#
 PROGRAMS += VBoxDTrace
-VBoxDTrace_TEMPLATE = VBOXR3NPEXE
-VBoxDTrace_DEFS = RTMEM_WRAP_TO_EF_APIS
-#VBoxDTrace_DEFS += YYDEBUG
-VBoxDTrace_SDKS = VBOX_ZLIB
+VBoxDTrace_TEMPLATE := VBOXR3EXE
+VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
+VBoxDTrace_LIBS = $(LIB_RUNTIME)
+
+
+#
+# Install the description.
+#
+INSTALLS += VBoxDTraceIns
+VBoxDTraceIns_TEMPLATE = VBoxInsExtPackDTrace
+VBoxDTraceIns_SOURCES = \
+        $(VBoxDTraceIns_0_OUTDIR)/ExtPack.xml \
+        COPYING=>ExtPack-SourceCodeLicense.txt
+$(call VBOX_EDIT_VERSION_RULE_FN,VBoxDTraceIns,ExtPack.xml)
+
+
+#
+# The ring-3 VBoxDTrace command implementation (library).
+#
+DLLS += VBoxDTraceCmd
+VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace
+VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS
+#VBoxDTraceCmd_DEFS += YYDEBUG
+VBoxDTraceCmd_SDKS = VBOX_ZLIB
 ifn1of ($(KBUILD_TARGET), win)
- VBoxDTrace_CFLAGS = -Wno-format
+ VBoxDTraceCmd_CFLAGS = -Wno-format -Wno-overlength-strings -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
 endif
-VBoxDTrace_INCS = \
-        ../include \
+VBoxDTraceCmd_INCS = \
+        include \
         $(VBOXDT_PATH_UTS)/common \
         $(VBOXDT_PATH_LIBCTF)/common \
         $(VBOXDT_PATH_LIBDTRACE)/common \
         $(VBOXDT_PATH_CMN_CTF)
-VBoxDTrace_SOURCES = \
+VBoxDTraceCmd_SOURCES = \
         $(VBOXDT_PATH_CMD)/dtrace/dtrace.c \
         \
@@ -70 +98 @@
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_xlator.c \
         \
-        $(VBoxDTrace_0_OUTDIR)/dt_errtags.c \
-        $(VBoxDTrace_0_OUTDIR)/dt_names.c \
+        $(VBoxDTraceCmd_0_OUTDIR)/dt_errtags.c \
+        $(VBoxDTraceCmd_0_OUTDIR)/dt_names.c \
         \
         $(VBOXDT_PATH_CMN_CTF)/ctf_create.c \
@@ -87 +115 @@
 
 if 1
- USES                += yacc
- VBoxDTrace_USES     += yacc
- VBoxDTrace_YACCTOOL  = BISON
- VBoxDTrace_YACCFLAGS = -d -y
- VBoxDTrace_SOURCES  += \
+ USES                   += yacc
+ VBoxDTraceCmd_USES     += yacc
+ VBoxDTraceCmd_YACCTOOL  = BISON
+ VBoxDTraceCmd_YACCFLAGS = -d -y
+ VBoxDTraceCmd_SOURCES  += \
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_grammar.y
- VBoxDTrace_INCS     += $(VBoxDTrace_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common
+ VBoxDTraceCmd_INCS     += $(VBoxDTraceCmd_0_OUTDIR)/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common
 else
  # TODO: generate these.
@@ -99 +127 @@
 
 if 1
- USES                += lex
- VBoxDTrace_USES     += lex
- VBoxDTrace_LEXTOOL   = FLEX
- VBoxDTrace_LEXFLAGS  = -l -B #-d -T
- VBoxDTrace_DEFS     += USING_FLEX
- VBoxDTrace_SOURCES  += \
+ USES                   += lex
+ VBoxDTraceCmd_USES     += lex
+ VBoxDTraceCmd_LEXTOOL   = FLEX
+ VBoxDTraceCmd_LEXFLAGS  = -l -B #-d -T
+ VBoxDTraceCmd_DEFS     += USING_FLEX
+ VBoxDTraceCmd_SOURCES  += \
         $(VBOXDT_PATH_LIBDTRACE)/common/dt_lex.l
 else
@@ -110 +138 @@
 endif
 
-VBoxDTrace_LIBS = \
+VBoxDTraceCmd_LIBS = \
         $(LIB_RUNTIME)
 
 
 # Generate sources
-$$(VBoxDTrace_0_OUTDIR)/dt_errtags.c: \
+$$(VBoxDTraceCmd_0_OUTDIR)/dt_errtags.c: \
                 $(VBOXDT_PATH_LIBDTRACE)/common/dt_errtags.h \
                 $(VBOXDT_PATH_LIBDTRACE)/common/mkerrtags.sed \
                 | $$(dir $$@)
-        $(MSG_GENERATE,VBoxDTrace,$@,$<)
+        $(MSG_GENERATE,VBoxDTraceCmd,$@,$<)
         $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mkerrtags.sed --output $@ $<
 
-$$(VBoxDTrace_0_OUTDIR)/dt_names.c: \
+$$(VBoxDTraceCmd_0_OUTDIR)/dt_names.c: \
                 $(VBOXDT_PATH_UTS)/common/sys/dtrace.h \
                 $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed \
                 | $$(dir $$@)
-        $(MSG_GENERATE,VBoxDTrace,$@,$<)
+        $(MSG_GENERATE,VBoxDTraceCmd,$@,$<)
         $(SED) -n -f $(VBOXDT_PATH_LIBDTRACE)/common/mknames.sed --output $@ $<
 
 
 #
-# Sournce not used or wanted: \
+# Source not used or wanted: \
 #       $(VBOXDT_PATH_LIBDTRACE)/common/dt_link.c
 #       $(VBOXDT_PATH_LIBDTRACE)/common/dt_pid.c
 #
 
+
+#
+# The ring-0 part of VBoxDTrace.
+#
+SYSMODS += VBoxDTraceR0
+VBoxDTraceR0_TEMPLATE = VBoxR0ExtPackDTrace
+VBoxDTraceR0_DEFS = IN_VBOXDTRACE_R0 IN_RT_R0
+ifeq ($(VBOX_LDR_FMT),elf)
+ VBoxDTraceR0_LDFLAGS = -e ModuleInit
+endif
+VBoxDTraceR0_INCS = \
+        include \
+        $(VBOXDT_PATH_UTS)/common
+VBoxDTraceR0_SOURCES = \
+        VBoxDTraceR0.cpp \
+        VBoxDTraceR0A.asm \
+        $(VBOXDT_PATH_UTS)/common/dtrace/dtrace.c
+VBoxDTraceR0_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
+ VBoxDTraceR0_LIBS += \
+        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
+endif
+
+
 include $(FILE_KBUILD_SUB_FOOTER)
 

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceLibCWrappers.h

@@ -29 +29 @@
 #else
 # include <sys/types.h>
+# include <limits.h>        /* Workaround for syslimit.h bug in gcc 4.8.3 on gentoo. */
 # include <syslimits.h>     /* PATH_MAX */
 # include <libgen.h>        /* basename */

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -24 +24 @@
 #include <iprt/types.h>
 #include <iprt/stdarg.h>
+#include <iprt/assert.h>
 #include <iprt/param.h>
 #include <iprt/errno.h>
@@ -32 +33 @@
 # include <sys/types.h>
 # include <limits.h>
+# ifdef RT_OS_LINUX
+#  include <sys/ucontext.h> /* avoid greg_t trouble */
+# endif
 # if defined(_MSC_VER)
 #  include <stdio.h>
@@ -48 +52 @@
 typedef uint64_t                    u_longlong_t;
 typedef uint64_t                    hrtime_t;
+#if !defined(NGREG) || !defined(RT_OS_LINUX)
 typedef RTCCINTREG                  greg_t;
+#else
+AssertCompileSize(greg_t, sizeof(RTCCINTREG));
+#endif
 typedef uintptr_t                   pc_t;
 typedef uint32_t                    id_t;

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c

@@ -1236 +1236 @@
 }
 
+#ifdef VBOX
+DECLEXPORT(int) RTCALL VBoxDTraceMain(int argc, char **argv)
+#else
 int
 main(int argc, char *argv[])
+#endif
 {
         dtrace_bufdesc_t buf;
@@ -1253 +1257 @@
         struct ps_prochandle *P;
         pid_t pid;
+
+        g_pname = basename(argv[0]);
 #else
         int c;
@@ -1259 +1265 @@
         RTGETOPTSTATE GetState;
 
-        err = RTR3InitExe(argc, &argv, RTR3INIT_FLAGS_SUPLIB);
+        err = RTR3InitDll(0);
         if (RT_FAILURE(err))
                 return RTMsgInitFailure(err);
@@ -1265 +1271 @@
 
         g_ofp = stdout;
-#endif
-        g_pname = basename(argv[0]);
+        g_pname = RTProcShortName();
+#endif
 
         if (argc == 1)