X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fevent-notifier-notification.c;h=199e615b15fe0e065d375b3a9991a0ba0c79fe0f;hb=31624f6cf986d7e7761847f66562c97bc773a02c;hp=570e5861cbc9974108afe65b97277e952201cca5;hpb=d7d45c0dc2815c77a947c745dfa79ed4060cc1c5;p=lttng-ust.git

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index 570e5861..199e615b 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -60,11 +60,11 @@ void capture_enum(struct lttng_msgpack_writer *writer,
 
 static
 int64_t capture_sequence_element_signed(uint8_t *ptr,
-		const struct lttng_integer_type *type)
+		struct lttng_ust_type_integer *integer_type)
 {
 	int64_t value;
-	unsigned int size = type->size;
-	bool byte_order_reversed = type->reverse_byte_order;
+	unsigned int size = integer_type->size;
+	bool byte_order_reversed = integer_type->reverse_byte_order;
 
 	switch (size) {
 	case 8:
@@ -109,11 +109,11 @@ 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)
+		struct lttng_ust_type_integer *integer_type)
 {
 	uint64_t value;
-	unsigned int size = type->size;
-	bool byte_order_reversed = type->reverse_byte_order;
+	unsigned int size = integer_type->size;
+	bool byte_order_reversed = integer_type->reverse_byte_order;
 
 	switch (size) {
 	case 8:
@@ -160,8 +160,8 @@ static
 void capture_sequence(struct lttng_msgpack_writer *writer,
 		struct lttng_interpreter_output *output)
 {
-	const struct lttng_integer_type *integer_type;
-	const struct lttng_type *nested_type;
+	struct lttng_ust_type_integer *integer_type;
+	struct lttng_ust_type_common *nested_type;
 	uint8_t *ptr;
 	bool signedness;
 	int i;
@@ -170,13 +170,13 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 
 	ptr = (uint8_t *) output->u.sequence.ptr;
 	nested_type = output->u.sequence.nested_type;
-	switch (nested_type->atype) {
-	case atype_integer:
-		integer_type = &nested_type->u.integer;
+	switch (nested_type->type) {
+	case lttng_ust_type_integer:
+		integer_type = lttng_ust_get_type_integer(nested_type);
 		break;
-	case atype_enum_nestable:
+	case lttng_ust_type_enum:
 		/* Treat enumeration as an integer. */
-		integer_type = &nested_type->u.enum_nestable.container_type->u.integer;
+		integer_type = lttng_ust_get_type_integer(lttng_ust_get_type_enum(nested_type)->container_type);
 		break;
 	default:
 		/* Capture of array of non-integer are not supported. */
@@ -368,7 +368,7 @@ void lttng_event_notifier_notification_send(
 	notification_init(&notif, event_notifier);
 
 	if (caa_unlikely(!cds_list_empty(&event_notifier->capture_bytecode_runtime_head))) {
-		struct lttng_bytecode_runtime *capture_bc_runtime;
+		struct lttng_ust_bytecode_runtime *capture_bc_runtime;
 
 		/*
 		 * Iterate over all the capture bytecodes. If the interpreter