X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-ftrace.c;h=476d6bce8e50600e0a6691317e3fd39d044c1c1b;hb=8b849768eb60b4822725018261eebd7f67c454b2;hp=7637e4b54dff1b1f1effda651ee3587e335ec03c;hpb=1695dc9a055c3383067cccac91cb8918cb2eaab1;p=lttng-modules.git

diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c
index 7637e4b5..476d6bce 100644
--- a/probes/lttng-ftrace.c
+++ b/probes/lttng-ftrace.c
@@ -36,7 +36,7 @@ void lttng_ftrace_handler(unsigned long ip, unsigned long parent_ip, void **data
 
 	if (!ACCESS_ONCE(chan->session->active))
 		return;
-	lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL,
+	lib_ring_buffer_ctx_init(&ctx, chan->chan, event,
 				 sizeof(payload), ltt_alignof(payload), -1);
 	ret = chan->ops->event_reserve(&ctx, event->id);
 	if (ret < 0)
@@ -78,7 +78,7 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
 	fields[0].type.atype = atype_integer;
 	fields[0].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
 	fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
-	fields[0].type.u.basic.integer.signedness = 0;
+	fields[0].type.u.basic.integer.signedness = is_signed_type(unsigned long);
 	fields[0].type.u.basic.integer.reverse_byte_order = 0;
 	fields[0].type.u.basic.integer.base = 16;
 	fields[0].type.u.basic.integer.encoding = lttng_encode_none;
@@ -87,11 +87,12 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
 	fields[1].type.atype = atype_integer;
 	fields[1].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
 	fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
-	fields[1].type.u.basic.integer.signedness = 0;
+	fields[1].type.u.basic.integer.signedness = is_signed_type(unsigned long);
 	fields[1].type.u.basic.integer.reverse_byte_order = 0;
 	fields[1].type.u.basic.integer.base = 16;
 	fields[1].type.u.basic.integer.encoding = lttng_encode_none;
 
+	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
 	return 0;
@@ -118,7 +119,7 @@ int lttng_ftrace_register(const char *name,
 	if (ret)
 		goto error;
 
-	event->u.ftrace.symbol_name = kstrdup(name, GFP_KERNEL);
+	event->u.ftrace.symbol_name = kstrdup(symbol_name, GFP_KERNEL);
 	if (!event->u.ftrace.symbol_name)
 		goto name_error;
 
@@ -127,7 +128,7 @@ int lttng_ftrace_register(const char *name,
 
 	ret = wrapper_register_ftrace_function_probe(event->u.ftrace.symbol_name,
 			&lttng_ftrace_ops, event);
-	if (ret)
+	if (ret < 0)
 		goto register_error;
 	return 0;
 
@@ -145,12 +146,17 @@ void lttng_ftrace_unregister(struct ltt_event *event)
 {
 	wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
 			&lttng_ftrace_ops, event);
+}
+EXPORT_SYMBOL_GPL(lttng_ftrace_unregister);
+
+void lttng_ftrace_destroy_private(struct ltt_event *event)
+{
 	kfree(event->u.ftrace.symbol_name);
 	kfree(event->desc->fields);
 	kfree(event->desc->name);
 	kfree(event->desc);
 }
-EXPORT_SYMBOL_GPL(lttng_ftrace_unregister);
+EXPORT_SYMBOL_GPL(lttng_ftrace_destroy_private);
 
 int lttng_ftrace_init(void)
 {