From: Mathieu Desnoyers Date: Wed, 28 Sep 2011 00:55:24 +0000 (-0400) Subject: Rename "comm" context to "procname" X-Git-Tag: v2.0-pre9~5 X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=c26fddc2d5dca76292182857908a0307d91863b6 Rename "comm" context to "procname" Signed-off-by: Mathieu Desnoyers --- diff --git a/Makefile b/Makefile index d25c3be3..c820bcbd 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ obj-m += ltt-ring-buffer-metadata-mmap-client.o obj-m += ltt-relay.o ltt-relay-objs := ltt-events.o ltt-debugfs-abi.o \ ltt-probes.o ltt-context.o \ - lttng-context-pid.o lttng-context-comm.o \ + lttng-context-pid.o lttng-context-procname.o \ lttng-context-prio.o lttng-context-nice.o \ lttng-context-vpid.o lttng-context-tid.o \ lttng-context-vtid.o lttng-context-ppid.o \ diff --git a/lttng-context-comm.c b/lttng-context-comm.c deleted file mode 100644 index beea83ff..00000000 --- a/lttng-context-comm.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * (C) Copyright 2009-2011 - - * Mathieu Desnoyers - * - * LTTng comm name context. - * - * Dual LGPL v2.1/GPL v2 license. - */ - -#include -#include -#include -#include "ltt-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "ltt-tracer.h" - -static -size_t comm_get_size(size_t offset) -{ - size_t size = 0; - - size += sizeof(current->comm); - return size; -} - -/* - * Racy read of comm. We simply copy its whole array size. - * Races with /proc//comm write only. - * Otherwise having to take a mutex for each event is cumbersome and - * could lead to crash in IRQ context and deadlock of the lockdep tracer. - */ -static -void comm_record(struct lttng_ctx_field *field, - struct lib_ring_buffer_ctx *ctx, - struct ltt_channel *chan) -{ - chan->ops->event_write(ctx, current->comm, sizeof(current->comm)); -} - -int lttng_add_comm_to_ctx(struct lttng_ctx **ctx) -{ - struct lttng_ctx_field *field; - - field = lttng_append_context(ctx); - if (!field) - return -ENOMEM; - if (lttng_find_context(*ctx, "comm")) { - lttng_remove_context_field(ctx, field); - return -EEXIST; - } - field->event_field.name = "comm"; - field->event_field.type.atype = atype_array; - field->event_field.type.u.array.elem_type.atype = atype_integer; - field->event_field.type.u.array.elem_type.u.basic.integer.size = sizeof(char) * CHAR_BIT; - field->event_field.type.u.array.elem_type.u.basic.integer.alignment = ltt_alignof(char) * CHAR_BIT; - field->event_field.type.u.array.elem_type.u.basic.integer.signedness = is_signed_type(char); - field->event_field.type.u.array.elem_type.u.basic.integer.reverse_byte_order = 0; - field->event_field.type.u.array.elem_type.u.basic.integer.base = 10; - field->event_field.type.u.array.elem_type.u.basic.integer.encoding = lttng_encode_UTF8; - field->event_field.type.u.array.length = sizeof(current->comm); - - field->get_size = comm_get_size; - field->record = comm_record; - wrapper_vmalloc_sync_all(); - return 0; -} -EXPORT_SYMBOL_GPL(lttng_add_comm_to_ctx); - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support"); diff --git a/lttng-context-procname.c b/lttng-context-procname.c new file mode 100644 index 00000000..c6bc6468 --- /dev/null +++ b/lttng-context-procname.c @@ -0,0 +1,72 @@ +/* + * (C) Copyright 2009-2011 - + * Mathieu Desnoyers + * + * LTTng procname context. + * + * Dual LGPL v2.1/GPL v2 license. + */ + +#include +#include +#include +#include "ltt-events.h" +#include "wrapper/ringbuffer/frontend_types.h" +#include "wrapper/vmalloc.h" +#include "ltt-tracer.h" + +static +size_t procname_get_size(size_t offset) +{ + size_t size = 0; + + size += sizeof(current->comm); + return size; +} + +/* + * Racy read of procname. We simply copy its whole array size. + * Races with /proc//procname write only. + * Otherwise having to take a mutex for each event is cumbersome and + * could lead to crash in IRQ context and deadlock of the lockdep tracer. + */ +static +void procname_record(struct lttng_ctx_field *field, + struct lib_ring_buffer_ctx *ctx, + struct ltt_channel *chan) +{ + chan->ops->event_write(ctx, current->comm, sizeof(current->comm)); +} + +int lttng_add_procname_to_ctx(struct lttng_ctx **ctx) +{ + struct lttng_ctx_field *field; + + field = lttng_append_context(ctx); + if (!field) + return -ENOMEM; + if (lttng_find_context(*ctx, "procname")) { + lttng_remove_context_field(ctx, field); + return -EEXIST; + } + field->event_field.name = "procname"; + field->event_field.type.atype = atype_array; + field->event_field.type.u.array.elem_type.atype = atype_integer; + field->event_field.type.u.array.elem_type.u.basic.integer.size = sizeof(char) * CHAR_BIT; + field->event_field.type.u.array.elem_type.u.basic.integer.alignment = ltt_alignof(char) * CHAR_BIT; + field->event_field.type.u.array.elem_type.u.basic.integer.signedness = is_signed_type(char); + field->event_field.type.u.array.elem_type.u.basic.integer.reverse_byte_order = 0; + field->event_field.type.u.array.elem_type.u.basic.integer.base = 10; + field->event_field.type.u.array.elem_type.u.basic.integer.encoding = lttng_encode_UTF8; + field->event_field.type.u.array.length = sizeof(current->comm); + + field->get_size = procname_get_size; + field->record = procname_record; + wrapper_vmalloc_sync_all(); + return 0; +} +EXPORT_SYMBOL_GPL(lttng_add_procname_to_ctx); + +MODULE_LICENSE("GPL and additional rights"); +MODULE_AUTHOR("Mathieu Desnoyers"); +MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");