X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-uts-ns.c;h=f8b0bd8c33b07a1eccf0e8d5ea78e560e41a2a66;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=55a228994cdb4ce971650bcb8e31aaab538746d7;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-uts-ns.c b/liblttng-ust/lttng-context-uts-ns.c
index 55a22899..f8b0bd8c 100644
--- a/liblttng-ust/lttng-context-uts-ns.c
+++ b/liblttng-ust/lttng-context-uts-ns.c
@@ -8,13 +8,14 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 #include <ust-tid.h>
 #include <urcu/tls-compat.h>
 
@@ -94,7 +95,7 @@ size_t uts_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(ino_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(ino_t));
 	size += sizeof(ino_t);
 	return size;
 }
@@ -102,13 +103,12 @@ size_t uts_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void uts_ns_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	ino_t uts_ns;
 
 	uts_ns = get_uts_ns();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(uts_ns));
-	chan->ops->event_write(ctx, &uts_ns, sizeof(uts_ns));
+	chan->ops->event_write(ctx, &uts_ns, sizeof(uts_ns), lttng_ust_rb_alignof(uts_ns));
 }
 
 static
@@ -125,8 +125,8 @@ int lttng_add_uts_ns_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
-			lttng_alignof(ino_t) * CHAR_BIT,
-			lttng_is_signed_type(ino_t),
+			lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(ino_t),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;