ust-tracepoint-event: fix probe creation

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

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 5ac372daa029421e5a387a68e90f15a092f30f32..0f40f30678023a3d880a5c37e0169b681d9a697c 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -13,9 +13,6 @@
 
 /* Define to "nothing" all macros used for TRACEPOINT_EVENT */
 
-#undef TRACEPOINT_EVENT
-#define TRACEPOINT_EVENT(_provider, _name, _args, _fields)
-
 #undef TRACEPOINT_EVENT_CLASS
 #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
 

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 6d1f9720469b7b6b95e499cb772ca1233d858f27..23c2e384fad1d4b152062ccafab7c2cbbc52cf20 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -417,9 +417,9 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)             \
 static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))\
 {                                                                            \
-       struct ltt_event *__event = __tp_cb_data;                             \
+       struct ltt_event *__event = __tp_data;                                \
        struct ltt_channel *__chan = __event->chan;                           \
-       struct lttng_ust_lib_ring_buffer_ctx __ctx;                                   \
+       struct lttng_ust_lib_ring_buffer_ctx __ctx;                           \
        size_t __event_len, __event_align;                                    \
        size_t __dynamic_len_idx = 0;                                         \
        size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name)];       \

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index 526ee00e58d130cd2093ab59e31078b7cdbf52b4..578b0f5151d3fecddf8a4321e54ac46d8f97ca23 100644 (file)
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -402,6 +402,8 @@ int __tracepoint_probe_unregister(const char *name, void *probe, void *data)
 {
        void *old;
 
+       fprintf(stderr, "TEST REGISTER %s\n", name);
+
        old = tracepoint_remove_probe(name, probe, data);
        if (IS_ERR(old))
                return PTR_ERR(old);