X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cgroup-ns.c;h=8ac91c4fbbe823a121d769f46587c066fc31f0f6;hb=60864af02c63fdaaf9264b4f14bfbc9f9fba64bd;hp=a6741fb1886c37e273dd22120d86fac7d9991c0f;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/liblttng-ust/lttng-context-cgroup-ns.c
index a6741fb1..8ac91c4f 100644
--- a/liblttng-ust/lttng-context-cgroup-ns.c
+++ b/liblttng-ust/lttng-context-cgroup-ns.c
@@ -8,15 +8,16 @@
  */
 
 #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 <ust-tid.h>
 #include <urcu/tls-compat.h>
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "lttng-tracer-core.h"
@@ -94,7 +95,7 @@ size_t cgroup_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,12 +103,12 @@ size_t cgroup_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void cgroup_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 cgroup_ns;
 
 	cgroup_ns = get_cgroup_ns();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(cgroup_ns));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(cgroup_ns));
 	chan->ops->event_write(ctx, &cgroup_ns, sizeof(cgroup_ns));
 }
 
@@ -125,8 +126,8 @@ int lttng_add_cgroup_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;