X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fevent-notifier-notification.c;h=eb3c0bce1da35436cec17a21bb72f470349195d8;hb=5469a374cdfeb3daa5d0f908f38ad427e3b753c9;hp=313339f19a3303e690de4190748ffa11e87c62f5;hpb=bb7ad29d1e8a78e4f0f5f9c7f121fd5545c90acb;p=lttng-ust.git

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index 313339f1..eb3c0bce 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;
@@ -174,7 +174,7 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 	case atype_integer:
 		integer_type = &nested_type->u.integer;
 		break;
-	case atype_enum:
+	case atype_enum_nestable:
 		/* Treat enumeration as an integer. */
 		integer_type = &nested_type->u.enum_nestable.container_type->u.integer;
 		break;
@@ -210,19 +210,19 @@ 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;
 
-	notif->event_notifier_token = event_notifier->user_token;
-	notif->notification_fd = event_notifier->group->notification_fd;
+	notif->event_notifier_token = event_notifier->priv->parent.user_token;
+	notif->notification_fd = event_notifier->priv->group->notification_fd;
 	notif->has_captures = false;
 
-	if (event_notifier->num_captures > 0) {
+	if (event_notifier->priv->num_captures > 0) {
 		lttng_msgpack_writer_init(writer, notif->capture_buf,
 				CAPTURE_BUFFER_SIZE);
 
-		lttng_msgpack_begin_array(writer, event_notifier->num_captures);
+		lttng_msgpack_begin_array(writer, event_notifier->priv->num_captures);
 		notif->has_captures = true;
 	}
 }
@@ -266,10 +266,10 @@ 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->group;
+			event_notifier->priv->group;
 	struct lttng_counter *error_counter;
 	size_t dimension_index[1];
 	int ret;
@@ -287,7 +287,7 @@ static void record_error(struct lttng_event_notifier *event_notifier)
 	if (!error_counter)
 		return;
 
-	dimension_index[0] = event_notifier->error_counter_index;
+	dimension_index[0] = event_notifier->priv->error_counter_index;
 	ret = event_notifier_group->error_counter->ops->counter_add(
 			error_counter->counter, dimension_index, 1);
 	if (ret)
@@ -296,17 +296,17 @@ 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);
 
-	ust_notif.token = event_notifier->user_token;
+	ust_notif.token = event_notifier->priv->parent.user_token;
 
 	/*
 	 * Prepare sending the notification from multiple buffers using an
@@ -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