X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-events.c;h=20db4c55bdc75703a8fad2b7016a38887ae768c1;hb=833ad6a0c344849269df6875f40c3d7cb21529d3;hp=703fd3d7fa5ddac330460e802de0e74fb79567de;hpb=9115fbdc0d5b0d69b32d3d4d924624fbbe22638e;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index 703fd3d7..20db4c55 100644
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -202,8 +202,7 @@ 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 lttng_kernel_event *event_param,
 				   void *filter)
 {
 	struct ltt_event *event;
@@ -223,16 +222,35 @@ 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->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(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:
+		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;
+		break;
+	case LTTNG_KERNEL_FUNCTION_TRACER:
+		ret = lttng_ftrace_register(name,
+				event_param->u.ftrace.symbol_name,
+				event);
 		if (ret)
 			goto register_error;
 		break;
@@ -247,8 +265,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:
@@ -265,13 +285,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);
@@ -378,10 +407,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 +436,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 +462,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 ?