X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Fevent-notifier-notification.c;h=c13279df58d13351a8832d5b47b6447a074b3bfe;hb=2fbda51c64f28b33b8febffc998af235e6fa9ea9;hp=4cfd1b15ceaa087ffda3bb7727e819a1d1cf62d1;hpb=36c52fffa1beb46c7c15bb6ac4a4179cae373b98;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/event-notifier-notification.c b/src/lib/lttng-ust/event-notifier-notification.c
index 4cfd1b15..c13279df 100644
--- a/src/lib/lttng-ust/event-notifier-notification.c
+++ b/src/lib/lttng-ust/event-notifier-notification.c
@@ -79,7 +79,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 		int16_t tmp;
 		tmp = *(int16_t *) ptr;
 		if (byte_order_reversed)
-			tmp = bswap_16(tmp);
+			tmp = lttng_ust_bswap_16(tmp);
 
 		value = tmp;
 		break;
@@ -89,7 +89,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 		int32_t tmp;
 		tmp = *(int32_t *) ptr;
 		if (byte_order_reversed)
-			tmp = bswap_32(tmp);
+			tmp = lttng_ust_bswap_32(tmp);
 
 		value = tmp;
 		break;
@@ -99,7 +99,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 		int64_t tmp;
 		tmp = *(int64_t *) ptr;
 		if (byte_order_reversed)
-			tmp = bswap_64(tmp);
+			tmp = lttng_ust_bswap_64(tmp);
 
 		value = tmp;
 		break;
@@ -128,7 +128,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 		uint16_t tmp;
 		tmp = *(uint16_t *) ptr;
 		if (byte_order_reversed)
-			tmp = bswap_16(tmp);
+			tmp = lttng_ust_bswap_16(tmp);
 
 		value = tmp;
 		break;
@@ -138,7 +138,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 		uint32_t tmp;
 		tmp = *(uint32_t *) ptr;
 		if (byte_order_reversed)
-			tmp = bswap_32(tmp);
+			tmp = lttng_ust_bswap_32(tmp);
 
 		value = tmp;
 		break;
@@ -148,7 +148,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 		uint64_t tmp;
 		tmp = *(uint64_t *) ptr;
 		if (byte_order_reversed)
-			tmp = bswap_64(tmp);
+			tmp = lttng_ust_bswap_64(tmp);
 
 		value = tmp;
 		break;
@@ -199,7 +199,7 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 		/*
 		 * We assume that alignment is smaller or equal to the size.
 		 * This currently holds true but if it changes in the future,
-		 * we will want to change the pointer arithmetics below to
+		 * we will want to change the pointer arithmetic below to
 		 * take into account that the next element might be further
 		 * away.
 		 */
@@ -214,7 +214,7 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 
 static
 void notification_init(struct lttng_event_notifier_notification *notif,
-		struct lttng_ust_event_notifier *event_notifier)
+		const struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_msgpack_writer *writer = &notif->writer;
 
@@ -270,7 +270,7 @@ void notification_append_empty_capture(
 	lttng_msgpack_write_nil(&notif->writer);
 }
 
-static void record_error(struct lttng_ust_event_notifier *event_notifier)
+static void record_error(const struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_event_notifier_group *event_notifier_group =
 			event_notifier->priv->group;
@@ -300,7 +300,7 @@ static void record_error(struct lttng_ust_event_notifier *event_notifier)
 
 static
 void notification_send(struct lttng_event_notifier_notification *notif,
-		struct lttng_ust_event_notifier *event_notifier)
+		const struct lttng_ust_event_notifier *event_notifier)
 {
 	ssize_t ret;
 	size_t content_len;
@@ -360,8 +360,9 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 }
 
 void lttng_event_notifier_notification_send(
-		struct lttng_ust_event_notifier *event_notifier,
+		const struct lttng_ust_event_notifier *event_notifier,
 		const char *stack_data,
+		struct lttng_ust_probe_ctx *probe_ctx,
 		struct lttng_ust_notification_ctx *notif_ctx)
 {
 	/*
@@ -386,7 +387,7 @@ void lttng_event_notifier_notification_send(
 			struct lttng_interpreter_output output;
 
 			if (capture_bc_runtime->interpreter_func(capture_bc_runtime,
-					stack_data, &output) == LTTNG_UST_BYTECODE_INTERPRETER_OK)
+					stack_data, probe_ctx, &output) == LTTNG_UST_BYTECODE_INTERPRETER_OK)
 				notification_append_capture(&notif, &output);
 			else
 				notification_append_empty_capture(&notif);