From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 25 Jan 2014 00:16:08 +0000 (-0500)
Subject: Fix: tracepoint name remapping
X-Git-Tag: v2.2.4~6
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c991463eb37dbbcf53c390a8db52125621153c69;p=lttng-modules.git

Fix: tracepoint name remapping

Commit

  "Introduce API to remap event names exposed by LTTng"

failed to map the event names enabled by the user to tracepoint names
known to the kernel. For instance, tracing with the kmem_kmalloc event
enabled is not gathering any event. This issue applies to all tracepoint
events declared with a different name within LTTng than within the Linux
kernel.

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

diff --git a/lttng-events.c b/lttng-events.c
index 27a44e4e..285c73bc 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -325,7 +325,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
 		event->desc = lttng_event_get(event_param->name);
 		if (!event->desc)
 			goto register_error;
-		ret = kabi_2635_tracepoint_probe_register(event_param->name,
+		ret = kabi_2635_tracepoint_probe_register(event->desc->kname,
 				event->desc->probe_callback,
 				event);
 		if (ret)
diff --git a/lttng-events.h b/lttng-events.h
index 37a5db71..19fd5080 100644
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -162,7 +162,8 @@ struct lttng_ctx {
 };
 
 struct lttng_event_desc {
-	const char *name;
+	const char *name;		/* lttng-modules name */
+	const char *kname;		/* Linux kernel name (tracepoints) */
 	void *probe_callback;
 	const struct lttng_event_ctx *ctx;	/* context */
 	const struct lttng_event_field *fields;	/* event payload */
diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index bf2e2b9d..680f466f 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -327,6 +327,7 @@ static void __event_probe__##_name(void *__data);
 static const struct lttng_event_desc __event_desc___##_map = {		\
 	.fields = __event_fields___##_template,		     		\
 	.name = #_map,					     		\
+	.kname = #_name,				     		\
 	.probe_callback = (void *) TP_PROBE_CB(_template),   		\
 	.nr_fields = ARRAY_SIZE(__event_fields___##_template),		\
 	.owner = THIS_MODULE,				     		\