X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-events.c;h=03dbb2036af923e3c60841783bca3f46ac528c00;hb=80996790fa42072d6525f2adb9a910312077bef6;hp=c64c20368aa6ec07b4afa6a8b08e9a27ba5ad6af;hpb=259b6cb38d19bbe9c039728459bc25acc0f6f8a0;p=lttng-modules.git

diff --git a/ltt-events.c b/ltt-events.c
index c64c2036..03dbb203 100644
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -530,7 +530,7 @@ int _ltt_field_statedump(struct ltt_session *session,
 	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",
+			"		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,
@@ -549,7 +549,7 @@ int _ltt_field_statedump(struct ltt_session *session,
 		break;
 	case atype_enum:
 		ret = lttng_metadata_printf(session,
-			"		%s %s;\n",
+			"		%s _%s;\n",
 			field->type.u.basic.enumeration.name,
 			field->name);
 		break;
@@ -559,7 +559,7 @@ int _ltt_field_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; encoding = %s; base = %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,
@@ -605,7 +605,7 @@ int _ltt_field_statedump(struct ltt_session *session,
 			return ret;
 
 		ret = lttng_metadata_printf(session,
-			"		integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } %s[ __%s_length ];\n",
+			"		integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s[ __%s_length ];\n",
 			elem_type->u.basic.integer.size,
 			(unsigned int) elem_type->u.basic.integer.alignment,
 			elem_type->u.basic.integer.signedness,
@@ -628,7 +628,7 @@ int _ltt_field_statedump(struct ltt_session *session,
 	case atype_string:
 		/* Default encoding is UTF8 */
 		ret = lttng_metadata_printf(session,
-			"		string%s %s;\n",
+			"		string%s _%s;\n",
 			field->type.u.basic.string.encoding == lttng_encode_ASCII ?
 				" { encoding = ASCII; }" : "",
 			field->name);
@@ -981,7 +981,7 @@ static int __init ltt_events_init(void)
 	event_cache = KMEM_CACHE(ltt_event, 0);
 	if (!event_cache)
 		return -ENOMEM;
-	ret = ltt_debugfs_abi_init();
+	ret = lttng_abi_init();
 	if (ret)
 		goto error_abi;
 	return 0;
@@ -996,7 +996,7 @@ static void __exit ltt_events_exit(void)
 {
 	struct ltt_session *session, *tmpsession;
 
-	ltt_debugfs_abi_exit();
+	lttng_abi_exit();
 	list_for_each_entry_safe(session, tmpsession, &sessions, list)
 		ltt_session_destroy(session);
 	kmem_cache_destroy(event_cache);