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 6c32249c9a8730021d2b7c9f77ea0d315b53c7ab..6632f67a3c8bb8c5e29d21efcb21c082ac407da2 100644 (file)
--- 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 2afd7f9953dde4e35791c45ec321dd4a5a7e3424..fb07c859bd46832f683dcc8c21e7cb5494fada66 100644 (file)
--- 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"
 

diff --git a/liblttng-ust/lttng-ust-tracelog-provider.h b/liblttng-ust/lttng-ust-tracelog-provider.h
index a1c431dce3306006b90ce0e6edfdd6635f5e5943..c1215baa73a04ce17efe89f4402bf9127409e4c0 100644 (file)
--- a/liblttng-ust/lttng-ust-tracelog-provider.h
+++ b/liblttng-ust/lttng-ust-tracelog-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-tracelog.h"