projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update ftrace symbol lookup
[lttng-modules.git]
/
probes
/
lttng-ftrace.c
diff --git
a/probes/lttng-ftrace.c
b/probes/lttng-ftrace.c
index 27f4e2bef81117b6bb1e0dc257b838f1c97162c0..7c4fc9f55d78f5fc98898cd45af8a630b37e90ae 100644
(file)
--- a/
probes/lttng-ftrace.c
+++ b/
probes/lttng-ftrace.c
@@
-38,7
+38,7
@@
void lttng_ftrace_handler(unsigned long ip, unsigned long parent_ip, void **data
return;
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL,
sizeof(payload), ltt_alignof(payload), -1);
return;
lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL,
sizeof(payload), ltt_alignof(payload), -1);
- ret = chan->ops->event_reserve(&ctx);
+ ret = chan->ops->event_reserve(&ctx
, event->id
);
if (ret < 0)
return;
payload.ip = ip;
if (ret < 0)
return;
payload.ip = ip;
@@
-70,10
+70,14
@@
int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
desc->nr_fields = 2;
desc->fields = fields =
kzalloc(2 * sizeof(struct lttng_event_field), GFP_KERNEL);
desc->nr_fields = 2;
desc->fields = fields =
kzalloc(2 * sizeof(struct lttng_event_field), GFP_KERNEL);
+ if (!desc->fields) {
+ ret = -ENOMEM;
+ goto error_fields;
+ }
fields[0].name = "ip";
fields[0].type.atype = atype_integer;
fields[0].name = "ip";
fields[0].type.atype = atype_integer;
- fields[0].type.u.basic.integer.size = sizeof(unsigned long);
- fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+ 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.reverse_byte_order = 0;
fields[0].type.u.basic.integer.base = 16;
fields[0].type.u.basic.integer.signedness = 0;
fields[0].type.u.basic.integer.reverse_byte_order = 0;
fields[0].type.u.basic.integer.base = 16;
@@
-81,8
+85,8
@@
int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
fields[1].name = "parent_ip";
fields[1].type.atype = atype_integer;
fields[1].name = "parent_ip";
fields[1].type.atype = atype_integer;
- fields[1].type.u.basic.integer.size = sizeof(unsigned long);
- fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+ 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.reverse_byte_order = 0;
fields[1].type.u.basic.integer.base = 16;
fields[1].type.u.basic.integer.signedness = 0;
fields[1].type.u.basic.integer.reverse_byte_order = 0;
fields[1].type.u.basic.integer.base = 16;
@@
-92,6
+96,8
@@
int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
return 0;
return 0;
+error_fields:
+ kfree(desc->name);
error_str:
kfree(desc);
return ret;
error_str:
kfree(desc);
return ret;
@@
-140,6
+146,7
@@
void lttng_ftrace_unregister(struct ltt_event *event)
wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
<tng_ftrace_ops, event);
kfree(event->u.ftrace.symbol_name);
wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
<tng_ftrace_ops, event);
kfree(event->u.ftrace.symbol_name);
+ kfree(event->desc->fields);
kfree(event->desc->name);
kfree(event->desc);
}
kfree(event->desc->name);
kfree(event->desc);
}
This page took
0.026202 seconds
and
4
git commands to generate.