X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-events.c;h=98cdf01f9d912071a38470ee602d954adf364c00;hb=c6dfdf6f8d56f882064922f623c7efb64c8f4010;hp=ec5d6830d4355fa64d91b1870d9443874dae8bd3;hpb=d6d808f3780d0b519aaf966e66df501730db7d13;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index ec5d6830..98cdf01f 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,
@@ -191,6 +192,7 @@ active:
 /*
  * Only used internally at session destruction.
  */
+static
 void _ltt_channel_destroy(struct ltt_channel *chan)
 {
 	chan->ops->channel_destroy(chan->chan);
@@ -203,7 +205,6 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
  */
 struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
 				   struct lttng_kernel_event *event_param,
-				   const struct lttng_event_desc *event_desc,
 				   void *filter)
 {
 	struct ltt_event *event;
@@ -223,7 +224,6 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
 	if (!event)
 		goto cache_error;
 	event->chan = chan;
-	event->desc = event_desc;
 	event->filter = filter;
 	event->id = chan->free_event_id++;
 	event->instrumentation = event_param->instrumentation;
@@ -231,30 +231,30 @@ struct ltt_event *ltt_event_create(struct ltt_channel *chan, char *name,
 	smp_wmb();
 	switch (event_param->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINTS:
-		ret = tracepoint_probe_register(name, event_desc->probe_callback,
-						event);
+		event->desc = ltt_event_get(name);
+		if (!event->desc)
+			goto register_error;
+		ret = tracepoint_probe_register(name,
+				event->desc->probe_callback,
+				event);
 		if (ret)
 			goto register_error;
 		break;
 	case LTTNG_KERNEL_KPROBES:
-		event->u.kprobe.kp.pre_handler = lttng_kprobes_handler_pre;
-		event->u.kprobe.symbol_name =
-			kzalloc(LTTNG_KPROBE_SYM_NAME_LEN * sizeof(char),
-				GFP_KERNEL);
-		if (!event->u.kprobe.symbol_name)
+		ret = lttng_kprobes_register(name,
+				event_param->u.kprobe.symbol_name,
+				event_param->u.kprobe.offset,
+				event_param->u.kprobe.addr,
+				event);
+		if (ret)
 			goto register_error;
-		memcpy(event->u.kprobe.symbol_name,
-		       event_param->u.kprobe.symbol_name,
-		       LTTNG_KPROBE_SYM_NAME_LEN * sizeof(char));
-		event->u.kprobe.kp.symbol_name =
-			event->u.kprobe.symbol_name;
-		event->u.kprobe.kp.offset = event_param->u.kprobe.offset;
-		event->u.kprobe.kp.addr = (void *) event_param->u.kprobe.addr;
-		ret = register_kprobe(&event->u.kprobe.kp);
-		if (ret) {
-			kfree(event->u.kprobe.symbol_name);
+		break;
+	case LTTNG_KERNEL_FUNCTION_TRACER:
+		ret = lttng_ftrace_register(name,
+				event_param->u.ftrace.symbol_name,
+				event);
+		if (ret)
 			goto register_error;
-		}
 		break;
 	default:
 		WARN_ON_ONCE(1);
@@ -267,8 +267,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(name,
+				event->desc->probe_callback,
+				event));
+	ltt_event_put(event->desc);
 register_error:
 	kmem_cache_free(event_cache, event);
 cache_error:
@@ -292,10 +294,14 @@ int _ltt_event_unregister(struct ltt_event *event)
 						  event);
 		if (ret)
 			return ret;
+		ltt_event_put(event->desc);
 		break;
 	case LTTNG_KERNEL_KPROBES:
-		unregister_kprobe(&event->u.kprobe.kp);
-		kfree(event->u.kprobe.symbol_name);
+		lttng_kprobes_unregister(event);
+		ret = 0;
+		break;
+	case LTTNG_KERNEL_FUNCTION_TRACER:
+		lttng_ftrace_unregister(event);
 		ret = 0;
 		break;
 	default:
@@ -304,19 +310,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.
  */
@@ -403,10 +396,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
@@ -426,10 +425,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
@@ -446,29 +451,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 ?
@@ -521,9 +543,6 @@ int _ltt_event_metadata_statedump(struct ltt_session *session,
 	if (ret)
 		goto end;
 
-
-
-
 	event->metadata_dumped = 1;
 end:
 	return ret;
@@ -570,7 +589,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"
 		);
 }
 
@@ -661,9 +680,10 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		"		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,