From: Stelios Bounanos <sb@enotty.net>
Date: Wed, 14 Oct 2015 16:31:36 +0000 (+0100)
Subject: Fix: Don't (re)define STAP_PROBEV
X-Git-Tag: v2.6.5~4
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=283fc55ce85946d9a632fbee762e85787da3b8b0

Fix: Don't (re)define STAP_PROBEV

Define a new LTTNG_STAP_PROBEV macro to avoid clobbering STAP_PROBEV or
emitting unwanted sdt probes when lttng-ust has been built without sdt
support.

Signed-off-by: Stelios Bounanos <sb@enotty.net>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h
index 7e8b59ee..0c59c9ae 100644
--- a/include/lttng/tracef.h
+++ b/include/lttng/tracef.h
@@ -34,7 +34,7 @@ void _lttng_ust_tracef(const char *fmt, ...);
 
 #define tracef(fmt, ...)						\
 	do {								\
-		STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
+		LTTNG_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
 		if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \
 			_lttng_ust_tracef(fmt, ## __VA_ARGS__);		\
 	} while (0)
diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 39539911..deb36a9f 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -37,8 +37,9 @@
 #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
 #define SDT_USE_VARIADIC
 #include <sys/sdt.h>
+#define LTTNG_STAP_PROBEV STAP_PROBEV
 #else
-#define STAP_PROBEV(...)
+#define LTTNG_STAP_PROBEV(...)
 #endif
 
 #ifdef __cplusplus
@@ -47,7 +48,7 @@ extern "C" {
 
 #define tracepoint(provider, name, ...)					    \
 	do {								    \
-		STAP_PROBEV(provider, name, ## __VA_ARGS__);		    \
+		LTTNG_STAP_PROBEV(provider, name, ## __VA_ARGS__);	    \
 		if (caa_unlikely(CMM_LOAD_SHARED(__tracepoint_##provider##___##name.state))) \
 			__tracepoint_cb_##provider##___##name(__VA_ARGS__); \
 	} while (0)