X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Fevent-notifier-notification.c;h=fe228c5d0553ed071c1f152f8eb299c8a7ed9f18;hb=baa8acf3af23bc5d9373144bef8147744b5ae01f;hp=32886fdb3a9d9fe19d81fec92dbbb75c8150326f;hpb=6339062a5bbe886493d0691d13e28e37a7206362;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 32886fdb..fe228c5d 100644
--- a/src/lib/lttng-ust/event-notifier-notification.c
+++ b/src/lib/lttng-ust/event-notifier-notification.c
@@ -15,7 +15,7 @@
 #include <urcu/rculist.h>
 
 #include "lttng-tracer-core.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
 #include "common/msgpack/msgpack.h"
 #include "lttng-bytecode.h"
 #include "common/patient.h"
@@ -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;
@@ -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,7 +360,7 @@ 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_notification_ctx *notif_ctx)
 {