X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-kretprobes.c;h=d71090a2bc321edcac3695c774508c1d0d025655;hb=31c77635394eb16a84e467ced6cb35b23d491ece;hp=60bafc043a65ef072d5c5aca1dcc24906722fbc4;hpb=7371f44c2c8ea6e60c0457671af008dd018c0b5f;p=lttng-modules.git diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c index 60bafc04..d71090a2 100644 --- a/probes/lttng-kretprobes.c +++ b/probes/lttng-kretprobes.c @@ -1,20 +1,33 @@ /* - * (C) Copyright 2009-2011 - - * Mathieu Desnoyers + * probes/lttng-kretprobes.c * * LTTng kretprobes integration module. * - * Dual LGPL v2.1/GPL v2 license. + * Copyright (C) 2009-2012 Mathieu Desnoyers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; only + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include #include #include #include -#include "../ltt-events.h" +#include "../lttng-events.h" #include "../wrapper/ringbuffer/frontend_types.h" #include "../wrapper/vmalloc.h" -#include "../ltt-tracer.h" +#include "../lttng-tracer.h" enum lttng_kretprobe_type { EVENT_ENTRY = 0, @@ -23,7 +36,7 @@ enum lttng_kretprobe_type { struct lttng_krp { struct kretprobe krp; - struct ltt_event *event[2]; /* ENTRY and RETURN */ + struct lttng_event *event[2]; /* ENTRY and RETURN */ struct kref kref_register; struct kref kref_alloc; }; @@ -35,9 +48,9 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi, { struct lttng_krp *lttng_krp = container_of(krpi->rp, struct lttng_krp, krp); - struct ltt_event *event = + struct lttng_event *event = lttng_krp->event[type]; - struct ltt_channel *chan = event->chan; + struct lttng_channel *chan = event->chan; struct lib_ring_buffer_ctx ctx; int ret; struct { @@ -56,11 +69,11 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi, payload.parent_ip = (unsigned long) krpi->ret_addr; lib_ring_buffer_ctx_init(&ctx, chan->chan, event, sizeof(payload), - ltt_alignof(payload), -1); + lttng_alignof(payload), -1); ret = chan->ops->event_reserve(&ctx, event->id); if (ret < 0) return 0; - lib_ring_buffer_align_ctx(&ctx, ltt_alignof(payload)); + lib_ring_buffer_align_ctx(&ctx, lttng_alignof(payload)); chan->ops->event_write(&ctx, &payload, sizeof(payload)); chan->ops->event_commit(&ctx); return 0; @@ -84,7 +97,7 @@ int lttng_kretprobes_handler_return(struct kretprobe_instance *krpi, * Create event description */ static -int lttng_create_kprobe_event(const char *name, struct ltt_event *event, +int lttng_create_kprobe_event(const char *name, struct lttng_event *event, enum lttng_kretprobe_type type) { struct lttng_event_field *fields; @@ -125,8 +138,8 @@ int lttng_create_kprobe_event(const char *name, struct ltt_event *event, fields[0].name = "ip"; 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 = is_signed_type(unsigned long); + fields[0].type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT; + fields[0].type.u.basic.integer.signedness = lttng_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; @@ -134,8 +147,8 @@ int lttng_create_kprobe_event(const char *name, struct ltt_event *event, fields[1].name = "parent_ip"; 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 = is_signed_type(unsigned long); + fields[1].type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT; + fields[1].type.u.basic.integer.signedness = lttng_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; @@ -156,8 +169,8 @@ int lttng_kretprobes_register(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct ltt_event *event_entry, - struct ltt_event *event_return) + struct lttng_event *event_entry, + struct lttng_event *event_return) { int ret; struct lttng_krp *lttng_krp; @@ -193,7 +206,7 @@ int lttng_kretprobes_register(const char *name, alloc_symbol; } lttng_krp->krp.kp.offset = offset; - lttng_krp->krp.kp.addr = (void *) addr; + lttng_krp->krp.kp.addr = (void *) (unsigned long) addr; /* Allow probe handler to find event structures */ lttng_krp->event[EVENT_ENTRY] = event_entry; @@ -247,7 +260,7 @@ void _lttng_kretprobes_unregister_release(struct kref *kref) unregister_kretprobe(<tng_krp->krp); } -void lttng_kretprobes_unregister(struct ltt_event *event) +void lttng_kretprobes_unregister(struct lttng_event *event) { kref_put(&event->u.kretprobe.lttng_krp->kref_register, _lttng_kretprobes_unregister_release); @@ -262,7 +275,7 @@ void _lttng_kretprobes_release(struct kref *kref) kfree(lttng_krp->krp.kp.symbol_name); } -void lttng_kretprobes_destroy_private(struct ltt_event *event) +void lttng_kretprobes_destroy_private(struct lttng_event *event) { kfree(event->desc->fields); kfree(event->desc->name); @@ -275,3 +288,7 @@ EXPORT_SYMBOL_GPL(lttng_kretprobes_destroy_private); MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers"); MODULE_DESCRIPTION("Linux Trace Toolkit Kretprobes Support"); +MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." + __stringify(LTTNG_MODULES_MINOR_VERSION) "." + __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) + LTTNG_MODULES_EXTRAVERSION);