Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules

[lttng-modules.git] / probes / lttng-ftrace.c

diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c
index ec086902892d644fcee8c57f70d78231cc4944f2..b8bd344749b201ecec08b6e93ebcba2715fb08f7 100644 (file)
--- a/probes/lttng-ftrace.c
+++ b/probes/lttng-ftrace.c
@@ -11,6 +11,10 @@
  * Ftrace function tracer does not seem to provide synchronization between probe
  * teardown and callback execution. Therefore, we make this module permanently
  * loaded (unloadable).
+ *
+ * TODO: Move to register_ftrace_function() (which is exported for
+ * modules) for Linux >= 3.0. It is faster (only enables the selected
+ * functions), and will stay there.
  */
 
 #include <linux/module.h>
@@ -36,7 +40,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 +82,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,7 +91,7 @@ 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;