Update ring buffer and pretty print

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

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index 96e7509c328bedb3211e3e3e3dfc4e4d6450f4a8..65c1d3ba80ecf30eedbe8ccf1402c81ab4864998 100644 (file)
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.c
@@ -29,7 +29,7 @@ int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs)
                return 0;
        lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, sizeof(data),
                                 ltt_alignof(data), -1);
-       ret = chan->ops->event_reserve(&ctx);
+       ret = chan->ops->event_reserve(&ctx, event->id);
        if (ret < 0)
                return 0;
        lib_ring_buffer_align_ctx(&ctx, ltt_alignof(data));
@@ -65,8 +65,8 @@ int lttng_create_kprobe_event(const char *name, struct ltt_event *event)
        }
        field->name = "ip";
        field->type.atype = atype_integer;
-       field->type.u.basic.integer.size = sizeof(unsigned long);
-       field->type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+       field->type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       field->type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
        field->type.u.basic.integer.signedness = 0;
        field->type.u.basic.integer.reverse_byte_order = 0;
        field->type.u.basic.integer.base = 16;