From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 10 Jun 2015 11:14:08 +0000 (+0200)
Subject: Allow TP_IP_PARAM arg name to be configured
X-Git-Tag: v2.6.2~6
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=676e66fb3b0a112978eb5d0c1e3e6c5632b68ddc;p=lttng-ust.git

Allow TP_IP_PARAM arg name to be configured

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 6c32249c..6632f67a 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -567,9 +567,9 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 
 #undef _TP_IP_PARAM
 #ifdef TP_IP_PARAM
-#define _TP_IP_PARAM()		ip
+#define _TP_IP_PARAM(x)		(x)
 #else /* TP_IP_PARAM */
-#define _TP_IP_PARAM()		__builtin_return_address(0)
+#define _TP_IP_PARAM(x)		__builtin_return_address(0)
 #endif /* TP_IP_PARAM */
 
 /*
@@ -628,7 +628,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 	__event_align = __event_get_align__##_provider##___##_name(_TP_ARGS_VAR(_args)); \
 	lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len,  \
 				 __event_align, -1, __chan->handle);	      \
-	__ctx.ip = _TP_IP_PARAM();					      \
+	__ctx.ip = _TP_IP_PARAM(TP_IP_PARAM);				      \
 	__ret = __chan->ops->event_reserve(&__ctx, __event->id);	      \
 	if (__ret < 0)							      \
 		return;							      \
diff --git a/liblttng-ust/lttng-ust-tracef-provider.h b/liblttng-ust/lttng-ust-tracef-provider.h
index 2afd7f99..fb07c859 100644
--- a/liblttng-ust/lttng-ust-tracef-provider.h
+++ b/liblttng-ust/lttng-ust-tracef-provider.h
@@ -30,7 +30,7 @@
 
 #endif /* _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H */
 
-#define TP_IP_PARAM	/* IP context received as parameter */
+#define TP_IP_PARAM ip	/* IP context received as parameter */
 #undef TRACEPOINT_INCLUDE
 #define TRACEPOINT_INCLUDE "./lttng-ust-tracef.h"