X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-events.c;h=17d87095c5a1b4bea0c15f9e8906fcb7bab47992;hb=64c796d8aec1efa5d6f0d5850d2a0095cb7842e3;hp=703fd3d7fa5ddac330460e802de0e74fb79567de;hpb=9115fbdc0d5b0d69b32d3d4d924624fbbe22638e;p=lttng-modules.git diff --git a/ltt-events.c b/ltt-events.c index 703fd3d7..17d87095 100644 --- a/ltt-events.c +++ b/ltt-events.c @@ -23,6 +23,7 @@ static DEFINE_MUTEX(sessions_mutex); static struct kmem_cache *event_cache; static void _ltt_event_destroy(struct ltt_event *event); +static void _ltt_channel_destroy(struct ltt_channel *chan); static int _ltt_event_unregister(struct ltt_event *event); static int _ltt_event_metadata_statedump(struct ltt_session *session, @@ -168,12 +169,17 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session, goto nomem; chan->session = session; init_waitqueue_head(&chan->notify_wait); + chan->id = session->free_chan_id++; + /* + * Note: the channel creation op already writes into the packet + * headers. Therefore the "chan" information used as input + * should be already accessible. + */ chan->chan = transport->ops.channel_create("[lttng]", chan, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval); if (!chan->chan) goto create_error; - chan->id = session->free_chan_id++; chan->ops = &transport->ops; list_add(&chan->list, &session->chan); mutex_unlock(&sessions_mutex); @@ -191,6 +197,7 @@ active: /* * Only used internally at session destruction. */ +static void _ltt_channel_destroy(struct ltt_channel *chan) { chan->ops->channel_destroy(chan->chan); @@ -201,9 +208,8 @@ void _ltt_channel_destroy(struct ltt_channel *chan) /* * Supports event creation while tracing session is active. */ -struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name, - enum instrum_type itype, - const struct lttng_event_desc *event_desc, +struct ltt_event *ltt_event_create(struct ltt_channel *chan, + struct lttng_kernel_event *event_param, void *filter) { struct ltt_event *event; @@ -217,22 +223,41 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name, * creation). Might require a hash if we have lots of events. */ list_for_each_entry(event, &chan->session->events, list) - if (!strcmp(event->desc->name, name)) + if (!strcmp(event->desc->name, event_param->name)) goto exist; event = kmem_cache_zalloc(event_cache, GFP_KERNEL); if (!event) goto cache_error; event->chan = chan; - event->desc = event_desc; event->filter = filter; event->id = chan->free_event_id++; - event->itype = itype; + event->instrumentation = event_param->instrumentation; /* Populate ltt_event structure before tracepoint registration. */ smp_wmb(); - switch (itype) { - case INSTRUM_TRACEPOINTS: - ret = tracepoint_probe_register(name, event_desc->probe_callback, - event); + switch (event_param->instrumentation) { + case LTTNG_KERNEL_TRACEPOINTS: + event->desc = ltt_event_get(event_param->name); + if (!event->desc) + goto register_error; + ret = tracepoint_probe_register(event_param->name, + event->desc->probe_callback, + event); + if (ret) + goto register_error; + break; + case LTTNG_KERNEL_KPROBES: + ret = lttng_kprobes_register(event_param->name, + event_param->u.kprobe.symbol_name, + event_param->u.kprobe.offset, + event_param->u.kprobe.addr, + event); + if (ret) + goto register_error; + break; + case LTTNG_KERNEL_FUNCTION_TRACER: + ret = lttng_ftrace_register(event_param->name, + event_param->u.ftrace.symbol_name, + event); if (ret) goto register_error; break; @@ -247,8 +272,10 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name, return event; statedump_error: - WARN_ON_ONCE(tracepoint_probe_unregister(name, event_desc->probe_callback, - event)); + WARN_ON_ONCE(tracepoint_probe_unregister(event_param->name, + event->desc->probe_callback, + event)); + ltt_event_put(event->desc); register_error: kmem_cache_free(event_cache, event); cache_error: @@ -265,13 +292,22 @@ int _ltt_event_unregister(struct ltt_event *event) { int ret = -EINVAL; - switch (event->itype) { - case INSTRUM_TRACEPOINTS: + switch (event->instrumentation) { + case LTTNG_KERNEL_TRACEPOINTS: ret = tracepoint_probe_unregister(event->desc->name, event->desc->probe_callback, event); if (ret) return ret; + ltt_event_put(event->desc); + break; + case LTTNG_KERNEL_KPROBES: + lttng_kprobes_unregister(event); + ret = 0; + break; + case LTTNG_KERNEL_FUNCTION_TRACER: + lttng_ftrace_unregister(event); + ret = 0; break; default: WARN_ON_ONCE(1); @@ -279,19 +315,6 @@ int _ltt_event_unregister(struct ltt_event *event) return ret; } -/* - * Used when an event FD is released. - */ -int ltt_event_unregister(struct ltt_event *event) -{ - int ret; - - mutex_lock(&sessions_mutex); - ret = ltt_event_unregister(event); - mutex_unlock(&sessions_mutex); - return ret; -} - /* * Only used internally at session destruction. */ @@ -344,7 +367,7 @@ int lttng_metadata_printf(struct ltt_session *session, */ waitret = wait_event_interruptible_timeout(*chan->ops->get_reader_wait_queue(chan), ({ - ret = chan->ops->event_reserve(&ctx); + ret = chan->ops->event_reserve(&ctx, 0); ret != -ENOBUFS || !ret; }), msecs_to_jiffies(LTTNG_METADATA_TIMEOUT_MSEC)); @@ -378,10 +401,16 @@ int _ltt_fields_metadata_statedump(struct ltt_session *session, switch (field->type.atype) { case atype_integer: ret = lttng_metadata_printf(session, - " integer { size = %u; align = %u; signed = %u;%s } %s;\n", + " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s;\n", field->type.u.basic.integer.size, field->type.u.basic.integer.alignment, field->type.u.basic.integer.signedness, + (field->type.u.basic.integer.encoding == lttng_encode_none) + ? "none" + : (field->type.u.basic.integer.encoding == lttng_encode_UTF8) + ? "UTF8" + : "ASCII", + field->type.u.basic.integer.base, #ifdef __BIG_ENDIAN field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "", #else @@ -401,10 +430,16 @@ int _ltt_fields_metadata_statedump(struct ltt_session *session, elem_type = &field->type.u.array.elem_type; ret = lttng_metadata_printf(session, - " integer { size = %u; align = %u; signed = %u;%s } %s[%u];\n", + " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[%u];\n", elem_type->u.basic.integer.size, elem_type->u.basic.integer.alignment, elem_type->u.basic.integer.signedness, + (elem_type->u.basic.integer.encoding == lttng_encode_none) + ? "none" + : (elem_type->u.basic.integer.encoding == lttng_encode_UTF8) + ? "UTF8" + : "ASCII", + elem_type->u.basic.integer.base, #ifdef __BIG_ENDIAN elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "", #else @@ -421,29 +456,46 @@ int _ltt_fields_metadata_statedump(struct ltt_session *session, elem_type = &field->type.u.sequence.elem_type; length_type = &field->type.u.sequence.length_type; ret = lttng_metadata_printf(session, - " integer { size = %u; align = %u; signed = %u;%s } %s[ integer { size = %u; align = %u; signed = %u;%s } ];\n", + " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } __%s_length;\n", + " integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[ __%s_length ];\n", + length_type->u.basic.integer.size, + length_type->u.basic.integer.alignment, + length_type->u.basic.integer.signedness, + (length_type->u.basic.integer.encoding == lttng_encode_none) + ? "none" + : (length_type->u.basic.integer.encoding == lttng_encode_UTF8) + ? "UTF8" + : "ASCII", + length_type->u.basic.integer.base, +#ifdef __BIG_ENDIAN + length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "", +#else + length_type->u.basic.integer.reverse_byte_order +? " byte_order = be;" : "", +#endif + field->name, elem_type->u.basic.integer.size, elem_type->u.basic.integer.alignment, elem_type->u.basic.integer.signedness, + (elem_type->u.basic.integer.encoding == lttng_encode_none) + ? "none" + : (elem_type->u.basic.integer.encoding == lttng_encode_UTF8) + ? "UTF8" + : "ASCII", + elem_type->u.basic.integer.base, #ifdef __BIG_ENDIAN elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "", #else elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "", #endif field->name, - length_type->u.basic.integer.size, - length_type->u.basic.integer.alignment, - length_type->u.basic.integer.signedness, -#ifdef __BIG_ENDIAN - length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "", -#else - length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "" -#endif + field->name ); break; } case atype_string: + /* Default encoding is UTF8 */ ret = lttng_metadata_printf(session, " string%s %s;\n", field->type.u.basic.string.encoding == lttng_encode_ASCII ? @@ -475,7 +527,7 @@ int _ltt_event_metadata_statedump(struct ltt_session *session, " name = %s;\n" " id = %u;\n" " stream_id = %u;\n" - " event.fields := struct {\n", + " fields := struct {\n", event->desc->name, event->id, event->chan->id); @@ -496,9 +548,6 @@ int _ltt_event_metadata_statedump(struct ltt_session *session, if (ret) goto end; - - - event->metadata_dumped = 1; end: return ret; @@ -545,7 +594,7 @@ int _ltt_stream_packet_context_declare(struct ltt_session *session) " uint32_t content_size;\n" " uint32_t packet_size;\n" " uint32_t cpu_id;\n" - "};\n" + "};\n\n" ); } @@ -598,7 +647,8 @@ int _ltt_event_header_declare(struct ltt_session *session) static int _ltt_session_metadata_statedump(struct ltt_session *session) { - char uuid_s[37]; + unsigned char *uuid_c = session->uuid.b; + unsigned char uuid_s[37]; struct ltt_channel *chan; struct ltt_event *event; int ret = 0; @@ -613,11 +663,11 @@ int _ltt_session_metadata_statedump(struct ltt_session *session) } snprintf(uuid_s, sizeof(uuid_s), - "%x%x%x%x-%x%x-%x%x-%x%x-%x%x%x%x%x%x", - uuid_s[0], uuid_s[1], uuid_s[2], uuid_s[3], - uuid_s[4], uuid_s[5], uuid_s[6], uuid_s[7], - uuid_s[8], uuid_s[9], uuid_s[10], uuid_s[11], - uuid_s[12], uuid_s[13], uuid_s[14], uuid_s[15]); + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + uuid_c[0], uuid_c[1], uuid_c[2], uuid_c[3], + uuid_c[4], uuid_c[5], uuid_c[6], uuid_c[7], + uuid_c[8], uuid_c[9], uuid_c[10], uuid_c[11], + uuid_c[12], uuid_c[13], uuid_c[14], uuid_c[15]); ret = lttng_metadata_printf(session, "typealias integer { size = 8; align = %u; signed = false; } := uint8_t;\n" @@ -630,15 +680,16 @@ int _ltt_session_metadata_statedump(struct ltt_session *session) "trace {\n" " major = %u;\n" " minor = %u;\n" - " uuid = %s;\n" + " uuid = \"%s\";\n" " byte_order = %s;\n" " packet.header := struct {\n" " uint32_t magic;\n" " uint8_t uuid[16];\n" " uint32_t stream_id;\n" - " };\n", + " };\n" "};\n\n", ltt_alignof(uint8_t) * CHAR_BIT, + ltt_alignof(uint16_t) * CHAR_BIT, ltt_alignof(uint32_t) * CHAR_BIT, ltt_alignof(uint64_t) * CHAR_BIT, CTF_VERSION_MAJOR, @@ -669,7 +720,7 @@ skip_session: } list_for_each_entry(event, &session->events, list) { - ret = _ltt_event_metadata_statedump(session, chan, event); + ret = _ltt_event_metadata_statedump(session, event->chan, event); if (ret) goto end; }