Changeset 59039 in vbox for trunk

Timestamp:

Dec 7, 2015 6:07:52 PM (9 years ago)

Author:

vboxsync

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

104583

Message:

IPRT: trace point build fix.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• generic/critsect-generic.cpp (modified) (1 diff)
• generic/critsectrw-generic.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1365 +1365 @@
 endif
 ifdef VBOX_WITH_DTRACE_R3
- VBoxRT_DEFS                  += IPRT_WITH_DTRACE=RT_NOTHING  IPRT_DTRACE_INCLUDE=\"dtrace/iprt.h\"
+ VBoxRT_DEFS                  += IPRT_WITH_DTRACE IPRT_DTRACE_INCLUDE=\"dtrace/iprt.h\"
 endif
 VBoxRT_DEFS.$(KBUILD_TYPE)    := $(RuntimeR3_DEFS.$(KBUILD_TYPE))
@@ -1712 +1712 @@
 endif
 ifdef VBOX_WITH_DTRACE_R0
- RuntimeR0_DEFS        += IPRT_WITH_DTRACE=VBOXVMM_  IPRT_DTRACE_INCLUDE=\"dtrace/VBoxVMM.h\"
+ RuntimeR0_DEFS        += IPRT_WITH_DTRACE IPRT_DTRACE_PREFIX=VBOXVMM_ IPRT_DTRACE_INCLUDE=\"dtrace/VBoxVMM.h\"
 endif
 RuntimeR0_INCS          = include

trunk/src/VBox/Runtime/generic/critsect-generic.cpp

@@ -45 +45 @@
 #ifdef IPRT_WITH_DTRACE
 # include IPRT_DTRACE_INCLUDE
-# define IPRT_CRITSECT_ENTERED  RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECT_ENTERED)
-# define IPRT_CRITSECT_LEAVING  RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECT_LEAVING)
-# define IPRT_CRITSECT_BUSY     RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECT_BUSY)
-# define IPRT_CRITSECT_WAITING  RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECT_WAITING)
+# ifdef IPRT_DTRACE_PREFIX
+#  define IPRT_CRITSECT_ENTERED  RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECT_ENTERED)
+#  define IPRT_CRITSECT_LEAVING  RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECT_LEAVING)
+#  define IPRT_CRITSECT_BUSY     RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECT_BUSY)
+#  define IPRT_CRITSECT_WAITING  RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECT_WAITING)
+# endif
 #else
 # define IPRT_CRITSECT_ENTERED(a_pvCritSect, a_pszName, a_cLockers, a_cNestings)            do {} while (0)

trunk/src/VBox/Runtime/generic/critsectrw-generic.cpp

@@ -49 +49 @@
 #ifdef IPRT_WITH_DTRACE
 # include IPRT_DTRACE_INCLUDE
-# define IPRT_CRITSECTRW_EXCL_ENTERED           RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_ENTERED)
-# define IPRT_CRITSECTRW_EXCL_ENTERED_ENABLED   RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_ENTERED_ENABLED)
-# define IPRT_CRITSECTRW_EXCL_LEAVING           RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_LEAVING)
-# define IPRT_CRITSECTRW_EXCL_LEAVING_ENABLED   RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_LEAVING_ENABLED)
-# define IPRT_CRITSECTRW_EXCL_BUSY              RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_BUSY)
-# define IPRT_CRITSECTRW_EXCL_WAITING           RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_WAITING)
-# define IPRT_CRITSECTRW_EXCL_ENTERED_SHARED    RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_ENTERED_SHARED)
-# define IPRT_CRITSECTRW_EXCL_LEAVING_SHARED    RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_EXCL_LEAVING_SHARED)
-# define IPRT_CRITSECTRW_SHARED_ENTERED         RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_SHARED_ENTERED)
-# define IPRT_CRITSECTRW_SHARED_LEAVING         RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_SHARED_LEAVING)
-# define IPRT_CRITSECTRW_SHARED_BUSY            RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_SHARED_BUSY)
-# define IPRT_CRITSECTRW_SHARED_WAITING         RT_CONCAT(IPRT_WITH_DTRACE,IPRT_CRITSECTRW_SHARED_WAITING)
+# ifdef IPRT_DTRACE_PREFIX
+#  define IPRT_CRITSECTRW_EXCL_ENTERED          RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_ENTERED)
+#  define IPRT_CRITSECTRW_EXCL_ENTERED_ENABLED  RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_ENTERED_ENABLED)
+#  define IPRT_CRITSECTRW_EXCL_LEAVING          RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_LEAVING)
+#  define IPRT_CRITSECTRW_EXCL_LEAVING_ENABLED  RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_LEAVING_ENABLED)
+#  define IPRT_CRITSECTRW_EXCL_BUSY             RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_BUSY)
+#  define IPRT_CRITSECTRW_EXCL_WAITING          RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_WAITING)
+#  define IPRT_CRITSECTRW_EXCL_ENTERED_SHARED   RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_ENTERED_SHARED)
+#  define IPRT_CRITSECTRW_EXCL_LEAVING_SHARED   RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_EXCL_LEAVING_SHARED)
+#  define IPRT_CRITSECTRW_SHARED_ENTERED        RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_SHARED_ENTERED)
+#  define IPRT_CRITSECTRW_SHARED_LEAVING        RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_SHARED_LEAVING)
+#  define IPRT_CRITSECTRW_SHARED_BUSY           RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_SHARED_BUSY)
+#  define IPRT_CRITSECTRW_SHARED_WAITING        RT_CONCAT(IPRT_DTRACE_PREFIX,IPRT_CRITSECTRW_SHARED_WAITING)
+# endif
 #else
 # define IPRT_CRITSECTRW_EXCL_ENTERED(a_pvCritSect, a_pszName, a_cNestings, a_cWaitingReaders, a_cWriters) do {} while (0)