X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-events.c;h=f98ef309e0ec47e3ee9c4bf8de0abbf2d4c93773;hb=979133c547728a541098dd7051e1e72ab7631788;hp=17d87095c5a1b4bea0c15f9e8906fcb7bab47992;hpb=125b4df47b59943f8ad4f4936c1deddbdd0d008e;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index 17d87095..f98ef309 100644
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -105,6 +105,7 @@ int ltt_session_start(struct ltt_session *session)
 	}
 
 	ACCESS_ONCE(session->active) = 1;
+	ACCESS_ONCE(session->been_active) = 1;
 	synchronize_trace();	/* Wait for in-flight events to complete */
 	ret = _ltt_session_metadata_statedump(session);
 	if (ret) {
@@ -154,10 +155,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 	struct ltt_transport *transport;
 
 	mutex_lock(&sessions_mutex);
-	if (session->active) {
-		printk(KERN_WARNING "LTTng refusing to add channel to active session\n");
+	if (session->been_active)
 		goto active;	/* Refuse to add channel to active session */
-	}
 	transport = ltt_transport_find(transport_name);
 	if (!transport) {
 		printk(KERN_WARNING "LTTng transport %s not found\n",
@@ -202,6 +201,7 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
 {
 	chan->ops->channel_destroy(chan->chan);
 	list_del(&chan->list);
+	lttng_destroy_context(chan->ctx);
 	kfree(chan);
 }
 
@@ -235,7 +235,7 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 	/* Populate ltt_event structure before tracepoint registration. */
 	smp_wmb();
 	switch (event_param->instrumentation) {
-	case LTTNG_KERNEL_TRACEPOINTS:
+	case LTTNG_KERNEL_TRACEPOINT:
 		event->desc = ltt_event_get(event_param->name);
 		if (!event->desc)
 			goto register_error;
@@ -245,7 +245,7 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 		if (ret)
 			goto register_error;
 		break;
-	case LTTNG_KERNEL_KPROBES:
+	case LTTNG_KERNEL_KPROBE:
 		ret = lttng_kprobes_register(event_param->name,
 				event_param->u.kprobe.symbol_name,
 				event_param->u.kprobe.offset,
@@ -253,13 +253,17 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan,
 				event);
 		if (ret)
 			goto register_error;
+		ret = try_module_get(event->desc->owner);
+		WARN_ON_ONCE(!ret);
 		break;
-	case LTTNG_KERNEL_FUNCTION_TRACER:
+	case LTTNG_KERNEL_FUNCTION:
 		ret = lttng_ftrace_register(event_param->name,
 				event_param->u.ftrace.symbol_name,
 				event);
 		if (ret)
 			goto register_error;
+		ret = try_module_get(event->desc->owner);
+		WARN_ON_ONCE(!ret);
 		break;
 	default:
 		WARN_ON_ONCE(1);
@@ -293,19 +297,18 @@ int _ltt_event_unregister(struct ltt_event *event)
 	int ret = -EINVAL;
 
 	switch (event->instrumentation) {
-	case LTTNG_KERNEL_TRACEPOINTS:
+	case LTTNG_KERNEL_TRACEPOINT:
 		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:
+	case LTTNG_KERNEL_KPROBE:
 		lttng_kprobes_unregister(event);
 		ret = 0;
 		break;
-	case LTTNG_KERNEL_FUNCTION_TRACER:
+	case LTTNG_KERNEL_FUNCTION:
 		lttng_ftrace_unregister(event);
 		ret = 0;
 		break;
@@ -321,8 +324,23 @@ int _ltt_event_unregister(struct ltt_event *event)
 static
 void _ltt_event_destroy(struct ltt_event *event)
 {
-	ltt_event_put(event->desc);
+	switch (event->instrumentation) {
+	case LTTNG_KERNEL_TRACEPOINT:
+		ltt_event_put(event->desc);
+		break;
+	case LTTNG_KERNEL_KPROBE:
+		module_put(event->desc->owner);
+		lttng_kprobes_destroy_private(event);
+		break;
+	case LTTNG_KERNEL_FUNCTION:
+		module_put(event->desc->owner);
+		lttng_ftrace_destroy_private(event);
+		break;
+	default:
+		WARN_ON_ONCE(1);
+	}
 	list_del(&event->list);
+	lttng_destroy_context(event->ctx);
 	kmem_cache_free(event_cache, event);
 }
 
@@ -388,124 +406,155 @@ end:
 }
 
 static
-int _ltt_fields_metadata_statedump(struct ltt_session *session,
-				   struct ltt_event *event)
+int _ltt_field_statedump(struct ltt_session *session,
+			 const struct lttng_event_field *field)
 {
-	const struct lttng_event_desc *desc = event->desc;
 	int ret = 0;
-	int i;
 
-	for (i = 0; i < desc->nr_fields; i++) {
-		const struct lttng_event_field *field = &desc->fields[i];
-
-		switch (field->type.atype) {
-		case atype_integer:
-			ret = lttng_metadata_printf(session,
-				"		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,
+	switch (field->type.atype) {
+	case atype_integer:
+		ret = lttng_metadata_printf(session,
+			"		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;" : "",
+			field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
-				field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
+			field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
 #endif
-				field->name);
-			break;
-		case atype_enum:
-			ret = lttng_metadata_printf(session,
-				"		%s %s;\n",
-				field->type.u.basic.enumeration.name,
-				field->name);
-			break;
-		case atype_array:
-		{
-			const struct lttng_basic_type *elem_type;
-
-			elem_type = &field->type.u.array.elem_type;
-			ret = lttng_metadata_printf(session,
-				"		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,
+			field->name);
+		break;
+	case atype_enum:
+		ret = lttng_metadata_printf(session,
+			"		%s %s;\n",
+			field->type.u.basic.enumeration.name,
+			field->name);
+		break;
+	case atype_array:
+	{
+		const struct lttng_basic_type *elem_type;
+
+		elem_type = &field->type.u.array.elem_type;
+		ret = lttng_metadata_printf(session,
+			"		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;" : "",
+			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
-				elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
+			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
 #endif
-				field->name, field->type.u.array.length);
-			break;
-		}
-		case atype_sequence:
-		{
-			const struct lttng_basic_type *elem_type;
-			const struct lttng_basic_type *length_type;
-
-			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; 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,
+			field->name, field->type.u.array.length);
+		break;
+	}
+	case atype_sequence:
+	{
+		const struct lttng_basic_type *elem_type;
+		const struct lttng_basic_type *length_type;
+
+		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; 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;" : "",
+			length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
-				length_type->u.basic.integer.reverse_byte_order
+			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,
+			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;" : "",
+			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
 #else
-				elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
+			elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
 #endif
-				field->name,
-				field->name
-				);
-			break;
-		}
+			field->name,
+			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 ?
-					" { encoding = ASCII; }" : "",
-				field->name);
-			break;
-		default:
-			WARN_ON_ONCE(1);
-			return -EINVAL;
-		}
+	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 ?
+				" { encoding = ASCII; }" : "",
+			field->name);
+		break;
+	default:
+		WARN_ON_ONCE(1);
+		return -EINVAL;
+	}
+	return ret;
+}
+
+static
+int _ltt_context_metadata_statedump(struct ltt_session *session,
+				    struct lttng_ctx *ctx)
+{
+	int ret = 0;
+	int i;
+
+	if (!ctx)
+		return 0;
+	for (i = 0; i < ctx->nr_fields; i++) {
+		const struct lttng_ctx_field *field = &ctx->fields[i];
+
+		ret = _ltt_field_statedump(session, &field->event_field);
+		if (ret)
+			return ret;
+	}
+	return ret;
+}
+
+static
+int _ltt_fields_metadata_statedump(struct ltt_session *session,
+				   struct ltt_event *event)
+{
+	const struct lttng_event_desc *desc = event->desc;
+	int ret = 0;
+	int i;
+
+	for (i = 0; i < desc->nr_fields; i++) {
+		const struct lttng_event_field *field = &desc->fields[i];
+
+		ret = _ltt_field_statedump(session, field);
+		if (ret)
+			return ret;
 	}
 	return ret;
 }
@@ -526,14 +575,35 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 		"event {\n"
 		"	name = %s;\n"
 		"	id = %u;\n"
-		"	stream_id = %u;\n"
-		"	fields := struct {\n",
+		"	stream_id = %u;\n",
 		event->desc->name,
 		event->id,
 		event->chan->id);
 	if (ret)
 		goto end;
 
+	if (event->ctx) {
+		ret = lttng_metadata_printf(session,
+			"	context := struct {\n");
+		if (ret)
+			goto end;
+	}
+	ret = _ltt_context_metadata_statedump(session, event->ctx);
+	if (ret)
+		goto end;
+	if (event->ctx) {
+		ret = lttng_metadata_printf(session,
+			"	};\n");
+		if (ret)
+			goto end;
+	}
+
+	ret = lttng_metadata_printf(session,
+		"	fields := struct {\n"
+		);
+	if (ret)
+		goto end;
+
 	ret = _ltt_fields_metadata_statedump(session, event);
 	if (ret)
 		goto end;
@@ -570,14 +640,32 @@ int _ltt_channel_metadata_statedump(struct ltt_session *session,
 		"stream {\n"
 		"	id = %u;\n"
 		"	event.header := %s;\n"
-		"	packet.context := struct packet_context;\n"
-		"};\n\n",
+		"	packet.context := struct packet_context;\n",
 		chan->id,
 		chan->header_type == 1 ? "struct event_header_compact" :
 			"struct event_header_large");
 	if (ret)
 		goto end;
 
+	if (chan->ctx) {
+		ret = lttng_metadata_printf(session,
+			"	event.context := struct {\n");
+		if (ret)
+			goto end;
+	}
+	ret = _ltt_context_metadata_statedump(session, chan->ctx);
+	if (ret)
+		goto end;
+	if (chan->ctx) {
+		ret = lttng_metadata_printf(session,
+			"	};\n");
+		if (ret)
+			goto end;
+	}
+
+	ret = lttng_metadata_printf(session,
+		"};\n\n");
+
 	chan->metadata_dumped = 1;
 end:
 	return ret;