Changeset 40595 in vbox

Timestamp:

Mar 23, 2012 2:54:46 PM (13 years ago)

Author:

vboxsync

Message:

Trying VBoxTpG in disabled mode. Updates kBuild from 2567 to 2570.

Location:

trunk

Files:

• . (modified) (1 prop)
• Config.kmk (modified) (6 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/VBoxVMM.d (moved) (moved from trunk/src/VBox/VMM/VMMR3/VBoxVMM.d ) (1 diff)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (4 diffs)

trunk/Config.kmk

@@ -1430 +1430 @@
 endif
 
-ifdef VBOX_WITH_DTRACE_R3
- USES += dtrace
-endif
+USES += dtrace
 
 #
@@ -1679 +1677 @@
 ifeq ($(KBUILD_HOST),win)
 # VBOX_XSLTPROC ?= $(PATH_DEVTOOLS)/win.x86/libxslt/10114/xsltproc.exe
- VBOX_XSLTPROC ?= $(PATH_DEVTOOLS)/win.x86/bin/xsltproc.exe
+ VBOX_XSLTPROC  ?= $(PATH_DEVTOOLS)/win.x86/bin/xsltproc.exe
 else ifeq ($(KBUILD_HOST),os2)
- VBOX_XSLTPROC ?= BEGINLIBPATH="$(PATH_DEVTOOLS_BLD)/bin;$$BEGINLIBPATH" $(PATH_DEVTOOLS_BLD)/bin/xsltproc.exe
-else
- VBOX_XSLTPROC ?= xsltproc$(HOSTSUFF_EXE)
+ VBOX_XSLTPROC  ?= BEGINLIBPATH="$(PATH_DEVTOOLS_BLD)/bin;$$BEGINLIBPATH" $(PATH_DEVTOOLS_BLD)/bin/xsltproc.exe
+else
+ VBOX_XSLTPROC  ?= xsltproc$(HOSTSUFF_EXE)
 endif
 
 # bin2c (convert binary files into C arrays)
-VBOX_BIN2C     ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
+VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
 
 # biossums (set BIOS checksums)
-VBOX_BIOSSUMS  ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE)
+VBOX_BIOSSUMS   ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE)
 
 # RTManifest (extension pack manifest utility)
 VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
 
+# VBoxTpG (tracepoint generator)
+VBOX_VBOXTPG    ?= $(PATH_OBJ)/VBoxTpG/VBoxTpG$(HOSTSUFF_EXE)
+
 # filesplitter (splits java files)
-VBOX_FILESPLIT ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE)
+VBOX_FILESPLIT  ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE)
 
 # GNU tar if present.
@@ -2169 +2170 @@
 ifeq ($(KBUILD_TARGET),solaris)
         $(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
-# Detect the solaris assembler. It is used by the the 4.x gcc compilers, 
-# apparently. It will not be able to handle IEMAll via a -pipe, only when 
+# Detect the solaris assembler. It is used by the the 4.x gcc compilers,
+# apparently. It will not be able to handle IEMAll via a -pipe, only when
 # passed a file. The solaris assmbler rulez ... not!
         $(APPEND) '$@' 'VBOX_AS_VERSION                ?= $(shell `gcc -print-prog-name=as` -V -o /dev/null < /dev/null 2>&1 | kmk_sed -e '1!d' -e 's/^as: *//' )'
@@ -2176 +2177 @@
         $(APPEND) '$@' ' VBOX_GCC_USING_SOLARIS_AS=1'
         $(APPEND) '$@' 'endif'
-        $(APPEND) '$@' 'ifndef VBOX_GCC_USING_SOLARIS_AS' 
+        $(APPEND) '$@' 'ifndef VBOX_GCC_USING_SOLARIS_AS'
         $(APPEND) '$@' ' VBOX_GCC_pipe                 ?= -pipe'
         $(APPEND) '$@' 'endif'
@@ -2623 +2624 @@
  endif
 endif
+
+#
+# VBoxTpG tool.
+#
+TOOL_VBoxTpG = The VirtualBox Tracepoint Generator
+TOOL_VBoxTpG_DTRACE_DEPEND         = $(VBOX_VBOXTPG)
+TOOL_VBoxTpG_DTRACE_HDR_FLAGS      := -h #-vvv
+define TOOL_VBoxTpG_DTRACE_HDR_CMDS
+        $(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)"
+endef
+TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED :=
+TOOL_VBoxTpG_DTRACE_OBJ_FLAGS      := -G #-vvv
+define TOOL_VBoxTpG_DTRACE_OBJ_CMDS
+        $(QUIET)$(VBOX_VBOXTPG) \
+                $(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \
+                $(flags) \
+                -o "$(out)" -s "$(source)"
+endef
+
+#
+# VBoxTpG tool - Disabled, only generate the header.
+#
+TOOL_VBoxTpG-Disabled = The VirtualBox Tracepoint Generator, disabled.
+TOOL_VBoxTpG-Disabled_DTRACE_DEPEND     = $(VBOX_VBOXTPG)
+TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h
+define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS
+        $(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)"
+endef
+TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES)
+
 
 ifdef VBOX_WITH_RAW_MODE
@@ -2776 +2807 @@
 TEMPLATE_VBoxR0_SYSSUFF             = .r0
 TEMPLATE_VBoxR0_MODE                = a+r,u+w
+
+TEMPLATE_VBoxR0_USES               += dtrace
+ifdef VBOX_WITH_DTRACE_R0
+ TEMPLATE_VBoxR0_DTRACETOOL         = VBoxTpG
+ TEMPLATE_VBoxR0_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R0
+else
+ TEMPLATE_VBoxR0_DTRACETOOL         = VBoxTpG-Disabled
+endif
 
 ifeq ($(VBOX_LDR_FMT),pe)

trunk/src/VBox/VMM/Makefile.kmk

@@ -237 +237 @@
  VBoxVMM_USES        += dtrace
  VBoxVMM_DEFS        += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3
- VBoxVMM_SOURCES     += VMMR3/VBoxVMM.d
+ VBoxVMM_SOURCES     += VBoxVMM.d
 endif
 
@@ -467 +467 @@
  VMMR0_SOURCES   = \
         VMMR0/CPUMR0.cpp \
+        VBoxVMM.d \
         VMMR0/CPUMR0A.asm \
         VMMR0/GMMR0.cpp \

trunk/src/VBox/VMM/VBoxVMM.d

@@ -27 +27 @@
     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);
+    probe r0__gvmm__vm__created(void *a_pGVM, void *a_pVM, unsigned int a_Pid, void *a_hEMT0, unsigned int a_cCpus);
 };
 

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -60 +60 @@
 #include <VBox/param.h>
 #include <VBox/err.h>
+
 #include <iprt/asm.h>
 #include <iprt/asm-amd64-x86.h>
@@ -77 +78 @@
 #include <iprt/spinlock.h>
 #include <iprt/timer.h>
+
+#include "dtrace/VBoxVMM.h"
 
 
@@ -751 +754 @@
     RTNATIVETHREAD hEMT0 = RTThreadNativeSelf();
     AssertReturn(hEMT0 != NIL_RTNATIVETHREAD, VERR_GVMM_BROKEN_IPRT);
-    RTNATIVETHREAD ProcId = RTProcSelf();
+    RTPROCESS      ProcId = RTProcSelf();
     AssertReturn(ProcId != NIL_RTPROCESS, VERR_GVMM_BROKEN_IPRT);
 
@@ -888 +891 @@
                                         pVM->aCpus[0].hNativeThreadR0 = hEMT0;
                                         pGVMM->cEMTs += cCpus;
+
+                                        VBOXVMM_R0_GVMM_VM_CREATED(pGVM, pVM, ProcId, (void *)hEMT0, cCpus);
 
                                         gvmmR0UsedUnlock(pGVMM);