X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=57ff55b71e45e80c32b8c54547b584a8d47a4899;hb=d96a4a7a78319be3386b57d9068817e9ffac2a24;hp=944d4fb2dafc06ba2de44d813cc13c9636d86656;hpb=b4a7570837f5cc3e8df56e51b4e8bfb9f95496d3;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 944d4fb2..57ff55b7 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -36,6 +36,7 @@
 #include <wrapper/types.h>
 #include <lttng/kernel-version.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/lttng-bytecode.h>
 #include <lttng/tracer.h>
 #include <lttng/event-notifier-notification.h>
@@ -3013,7 +3014,7 @@ int _lttng_integer_type_statedump(struct lttng_session *session,
 {
 	int ret;
 
-	WARN_ON_ONCE(type->atype != atype_integer);
+	WARN_ON_ONCE(type->type != lttng_kernel_type_integer);
 	ret = print_tabs(session, nesting);
 	if (ret)
 		return ret;
@@ -3022,9 +3023,9 @@ int _lttng_integer_type_statedump(struct lttng_session *session,
 		type->u.integer.size,
 		type->u.integer.alignment,
 		type->u.integer.signedness,
-		(type->u.integer.encoding == lttng_encode_none)
+		(type->u.integer.encoding == lttng_kernel_string_encoding_none)
 			? "none"
-			: (type->u.integer.encoding == lttng_encode_UTF8)
+			: (type->u.integer.encoding == lttng_kernel_string_encoding_UTF8)
 				? "UTF8"
 				: "ASCII",
 		type->u.integer.base,
@@ -3049,7 +3050,7 @@ int _lttng_struct_type_statedump(struct lttng_session *session,
 	uint32_t i, nr_fields;
 	unsigned int alignment;
 
-	WARN_ON_ONCE(type->atype != atype_struct_nestable);
+	WARN_ON_ONCE(type->type != lttng_kernel_type_struct_nestable);
 
 	ret = print_tabs(session, nesting);
 	if (ret)
@@ -3110,7 +3111,7 @@ int _lttng_variant_type_statedump(struct lttng_session *session,
 	int ret;
 	uint32_t i, nr_choices;
 
-	WARN_ON_ONCE(type->atype != atype_variant_nestable);
+	WARN_ON_ONCE(type->type != lttng_kernel_type_variant_nestable);
 	/*
 	 * CTF 1.8 does not allow expressing nonzero variant alignment in a nestable way.
 	 */
@@ -3169,7 +3170,7 @@ int _lttng_array_field_statedump(struct lttng_session *session,
 	int ret;
 	const struct lttng_type *elem_type;
 
-	WARN_ON_ONCE(field->type.atype != atype_array_nestable);
+	WARN_ON_ONCE(field->type.type != lttng_kernel_type_array_nestable);
 
 	if (field->type.u.array_nestable.alignment) {
 		ret = print_tabs(session, nesting);
@@ -3187,10 +3188,10 @@ int _lttng_array_field_statedump(struct lttng_session *session,
 	 * currently supported.
 	 */
 	elem_type = field->type.u.array_nestable.elem_type;
-	switch (elem_type->atype) {
-	case atype_integer:
-	case atype_struct_nestable:
-	case atype_variant_nestable:
+	switch (elem_type->type) {
+	case lttng_kernel_type_integer:
+	case lttng_kernel_type_struct_nestable:
+	case lttng_kernel_type_variant_nestable:
 		ret = _lttng_type_statedump(session, elem_type, nesting);
 		if (ret)
 			return ret;
@@ -3218,7 +3219,7 @@ int _lttng_sequence_field_statedump(struct lttng_session *session,
 	const char *length_name;
 	const struct lttng_type *elem_type;
 
-	WARN_ON_ONCE(field->type.atype != atype_sequence_nestable);
+	WARN_ON_ONCE(field->type.type != lttng_kernel_type_sequence_nestable);
 
 	length_name = field->type.u.sequence_nestable.length_name;
 
@@ -3239,10 +3240,10 @@ int _lttng_sequence_field_statedump(struct lttng_session *session,
 	 * currently supported.
 	 */
 	elem_type = field->type.u.sequence_nestable.elem_type;
-	switch (elem_type->atype) {
-	case atype_integer:
-	case atype_struct_nestable:
-	case atype_variant_nestable:
+	switch (elem_type->type) {
+	case lttng_kernel_type_integer:
+	case lttng_kernel_type_struct_nestable:
+	case lttng_kernel_type_variant_nestable:
 		ret = _lttng_type_statedump(session, elem_type, nesting);
 		if (ret)
 			return ret;
@@ -3266,13 +3267,13 @@ int _lttng_enum_type_statedump(struct lttng_session *session,
 		const struct lttng_type *type,
 		size_t nesting)
 {
-	const struct lttng_enum_desc *enum_desc;
+	const struct lttng_kernel_enum_desc *enum_desc;
 	const struct lttng_type *container_type;
 	int ret;
 	unsigned int i, nr_entries;
 
 	container_type = type->u.enum_nestable.container_type;
-	if (container_type->atype != atype_integer) {
+	if (container_type->type != lttng_kernel_type_integer) {
 		ret = -EINVAL;
 		goto end;
 	}
@@ -3293,7 +3294,7 @@ int _lttng_enum_type_statedump(struct lttng_session *session,
 		goto end;
 	/* Dump all entries */
 	for (i = 0; i < nr_entries; i++) {
-		const struct lttng_enum_entry *entry = &enum_desc->entries[i];
+		const struct lttng_kernel_enum_entry *entry = &enum_desc->entries[i];
 		int j, len;
 
 		ret = print_tabs(session, nesting + 1);
@@ -3410,14 +3411,14 @@ int _lttng_string_type_statedump(struct lttng_session *session,
 {
 	int ret;
 
-	WARN_ON_ONCE(type->atype != atype_string);
+	WARN_ON_ONCE(type->type != lttng_kernel_type_string);
 	/* Default encoding is UTF8 */
 	ret = print_tabs(session, nesting);
 	if (ret)
 		return ret;
 	ret = lttng_metadata_printf(session,
 		"string%s",
-		type->u.string.encoding == lttng_encode_ASCII ?
+		type->u.string.encoding == lttng_kernel_string_encoding_ASCII ?
 			" { encoding = ASCII; }" : "");
 	return ret;
 }
@@ -3429,7 +3430,7 @@ int _lttng_string_field_statedump(struct lttng_session *session,
 {
 	int ret;
 
-	WARN_ON_ONCE(field->type.atype != atype_string);
+	WARN_ON_ONCE(field->type.type != lttng_kernel_type_string);
 	ret = _lttng_string_type_statedump(session, &field->type, nesting);
 	if (ret)
 		return ret;
@@ -3446,26 +3447,26 @@ int _lttng_type_statedump(struct lttng_session *session,
 {
 	int ret = 0;
 
-	switch (type->atype) {
-	case atype_integer:
+	switch (type->type) {
+	case lttng_kernel_type_integer:
 		ret = _lttng_integer_type_statedump(session, type, nesting);
 		break;
-	case atype_enum_nestable:
+	case lttng_kernel_type_enum_nestable:
 		ret = _lttng_enum_type_statedump(session, type, nesting);
 		break;
-	case atype_string:
+	case lttng_kernel_type_string:
 		ret = _lttng_string_type_statedump(session, type, nesting);
 		break;
-	case atype_struct_nestable:
+	case lttng_kernel_type_struct_nestable:
 		ret = _lttng_struct_type_statedump(session, type, nesting);
 		break;
-	case atype_variant_nestable:
+	case lttng_kernel_type_variant_nestable:
 		ret = _lttng_variant_type_statedump(session, type, nesting);
 		break;
 
 	/* Nested arrays and sequences are not supported yet. */
-	case atype_array_nestable:
-	case atype_sequence_nestable:
+	case lttng_kernel_type_array_nestable:
+	case lttng_kernel_type_sequence_nestable:
 	default:
 		WARN_ON_ONCE(1);
 		return -EINVAL;
@@ -3483,26 +3484,26 @@ int _lttng_field_statedump(struct lttng_session *session,
 {
 	int ret = 0;
 
-	switch (field->type.atype) {
-	case atype_integer:
+	switch (field->type.type) {
+	case lttng_kernel_type_integer:
 		ret = _lttng_integer_field_statedump(session, field, nesting);
 		break;
-	case atype_enum_nestable:
+	case lttng_kernel_type_enum_nestable:
 		ret = _lttng_enum_field_statedump(session, field, nesting);
 		break;
-	case atype_string:
+	case lttng_kernel_type_string:
 		ret = _lttng_string_field_statedump(session, field, nesting);
 		break;
-	case atype_struct_nestable:
+	case lttng_kernel_type_struct_nestable:
 		ret = _lttng_struct_field_statedump(session, field, nesting);
 		break;
-	case atype_array_nestable:
+	case lttng_kernel_type_array_nestable:
 		ret = _lttng_array_field_statedump(session, field, nesting);
 		break;
-	case atype_sequence_nestable:
+	case lttng_kernel_type_sequence_nestable:
 		ret = _lttng_sequence_field_statedump(session, field, nesting);
 		break;
-	case atype_variant_nestable:
+	case lttng_kernel_type_variant_nestable:
 		ret = _lttng_variant_field_statedump(session, field, nesting);
 		break;