X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fevent-notifier-notification.c;h=199e615b15fe0e065d375b3a9991a0ba0c79fe0f;hb=2adb7ad28124fdbc0ad61bcada1c7dbceb03e9ab;hp=f8bad6db6e56734609d6321b9d79691829705d6f;hpb=115db533af4d56a1b5c8b3a5ff6a15dc58579cd8;p=lttng-ust.git

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index f8bad6db..199e615b 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -24,7 +24,7 @@
  * of the notification struct we are sending alongside the capture buffer.
  */
 #define CAPTURE_BUFFER_SIZE \
-	(PIPE_BUF - sizeof(struct lttng_ust_event_notifier_notification) - 1)
+	(PIPE_BUF - sizeof(struct lttng_ust_abi_event_notifier_notification) - 1)
 
 struct lttng_event_notifier_notification {
 	int notification_fd;
@@ -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. */
@@ -210,7 +210,7 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 
 static
 void notification_init(struct lttng_event_notifier_notification *notif,
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_msgpack_writer *writer = &notif->writer;
 
@@ -266,7 +266,7 @@ void notification_append_empty_capture(
 	lttng_msgpack_write_nil(&notif->writer);
 }
 
-static void record_error(struct lttng_event_notifier *event_notifier)
+static void record_error(struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_event_notifier_group *event_notifier_group =
 			event_notifier->priv->group;
@@ -296,12 +296,12 @@ static void record_error(struct lttng_event_notifier *event_notifier)
 
 static
 void notification_send(struct lttng_event_notifier_notification *notif,
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	ssize_t ret;
 	size_t content_len;
 	int iovec_count = 1;
-	struct lttng_ust_event_notifier_notification ust_notif = {0};
+	struct lttng_ust_abi_event_notifier_notification ust_notif = {0};
 	struct iovec iov[2];
 
 	assert(notif);
@@ -356,7 +356,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 }
 
 void lttng_event_notifier_notification_send(
-		struct lttng_event_notifier *event_notifier,
+		struct lttng_ust_event_notifier *event_notifier,
 		const char *stack_data)
 {
 	/*
@@ -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