X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-event-notifier-notification.c;h=d10f0fdabec3772b292fa3eb063ca58da8837e5c;hb=4140ad5d31731fbfc179fbcf0221322cfeba6461;hp=906ed109a8a1e01c7f95011387f724b8b898d86a;hpb=12bb2edb6ed3e96d3299a979e49b828f2b17dcb2;p=lttng-modules.git

diff --git a/src/lttng-event-notifier-notification.c b/src/lttng-event-notifier-notification.c
index 906ed109..d10f0fda 100644
--- a/src/lttng-event-notifier-notification.c
+++ b/src/lttng-event-notifier-notification.c
@@ -11,6 +11,7 @@
 #include <lttng/events.h>
 #include <lttng/msgpack.h>
 #include <lttng/event-notifier-notification.h>
+#include <lttng/events-internal.h>
 #include <wrapper/barrier.h>
 
 /*
@@ -95,7 +96,7 @@ end:
 
 static
 int64_t capture_sequence_element_signed(uint8_t *ptr,
-		const struct lttng_integer_type *type)
+		const struct lttng_kernel_type_integer *type)
 {
 	int64_t value = 0;
 	unsigned int size = type->size;
@@ -144,7 +145,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 
 static
 uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
-		const struct lttng_integer_type *type)
+		const struct lttng_kernel_type_integer *type)
 {
 	uint64_t value = 0;
 	unsigned int size = type->size;
@@ -194,8 +195,8 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 int capture_sequence(struct lttng_msgpack_writer *writer,
 		struct lttng_interpreter_output *output)
 {
-	const struct lttng_integer_type *integer_type = NULL;
-	const struct lttng_type *nested_type;
+	const struct lttng_kernel_type_integer *integer_type = NULL;
+	const struct lttng_kernel_type_common *nested_type;
 	uint8_t *ptr;
 	bool signedness;
 	int ret, i;
@@ -210,11 +211,11 @@ int capture_sequence(struct lttng_msgpack_writer *writer,
 	nested_type = output->u.sequence.nested_type;
 	switch (nested_type->type) {
 	case lttng_kernel_type_integer:
-		integer_type = &nested_type->u.integer;
+		integer_type = lttng_kernel_get_type_integer(nested_type);
 		break;
-	case lttng_kernel_type_enum_nestable:
+	case lttng_kernel_type_enum:
 		/* Treat enumeration as an integer. */
-		integer_type = &nested_type->u.enum_nestable.container_type->u.integer;
+		integer_type = lttng_kernel_get_type_integer(lttng_kernel_get_type_enum(nested_type)->container_type);
 		break;
 	default:
 		/* Capture of array of non-integer are not supported. */
@@ -381,7 +382,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 {
 	struct lttng_event_notifier_group *event_notifier_group = event_notifier->group;
 	struct lib_ring_buffer_ctx ctx;
-	struct lttng_kernel_event_notifier_notification kernel_notif;
+	struct lttng_kernel_abi_event_notifier_notification kernel_notif;
 	size_t capture_buffer_content_len, reserve_size;
 	int ret;