Function tracer support

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

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index bee935f779bfe699ecd1e97e299c41c8e32155a6..9d9fb5b9a759fd6445f70478c907657736f1f082 100644 (file)
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.c
@@ -44,18 +44,19 @@ static
 int lttng_create_kprobe_event(const char *name, struct ltt_event *event)
 {
        struct lttng_event_field *field;
+       struct lttng_event_desc *desc;
        int ret;
 
-       event->desc = kzalloc(sizeof(*event->desc), GFP_KERNEL);
-       if (!event->desc)
+       desc = kzalloc(sizeof(*event->desc), GFP_KERNEL);
+       if (!desc)
                return -ENOMEM;
-       event->desc->name = kstrdup(name, GFP_KERNEL);
-       if (!event->desc->name) {
+       desc->name = kstrdup(name, GFP_KERNEL);
+       if (!desc->name) {
                ret = -ENOMEM;
                goto error_str;
        }
-       event->desc->nr_fields = 1;
-       event->desc->fields = field =
+       desc->nr_fields = 1;
+       desc->fields = field =
                kzalloc(1 * sizeof(struct lttng_event_field), GFP_KERNEL);
        field->name = "ip";
        field->type.atype = atype_integer;
@@ -63,11 +64,14 @@ int lttng_create_kprobe_event(const char *name, struct ltt_event *event)
        field->type.u.basic.integer.alignment = ltt_alignof(unsigned long);
        field->type.u.basic.integer.signedness = 0;
        field->type.u.basic.integer.reverse_byte_order = 0;
+       field->type.u.basic.integer.base = 16;
+       field->type.u.basic.integer.encoding = lttng_encode_none;
+       event->desc = desc;
 
        return 0;
 
 error_str:
-       kfree(event->desc);
+       kfree(desc);
        return ret;
 }
 
@@ -85,14 +89,14 @@ int lttng_kprobes_register(const char *name,
        memset(&event->u.kprobe.kp, 0, sizeof(event->u.kprobe.kp));
        event->u.kprobe.kp.pre_handler = lttng_kprobes_handler_pre;
        event->u.kprobe.symbol_name =
-               kzalloc(LTTNG_KPROBE_SYM_NAME_LEN * sizeof(char),
+               kzalloc(LTTNG_SYM_NAME_LEN * sizeof(char),
                        GFP_KERNEL);
        if (!event->u.kprobe.symbol_name) {
                ret = -ENOMEM;
                goto name_error;
        }
        memcpy(event->u.kprobe.symbol_name, symbol_name,
-              LTTNG_KPROBE_SYM_NAME_LEN * sizeof(char));
+              LTTNG_SYM_NAME_LEN * sizeof(char));
        event->u.kprobe.kp.symbol_name =
                event->u.kprobe.symbol_name;
        event->u.kprobe.kp.offset = offset;