Refactoring: hide internal fields of ring buffer context

[lttng-ust.git] / liblttng-ust / lttng-context-vtid.c

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index 432b8b0dd16dcc4163acbee3794a973caf57b24b..297d8025a552726a286bcff18d442c004afd0dbc 100644 (file)
--- a/liblttng-ust/lttng-context-vtid.c
+++ b/liblttng-ust/lttng-context-vtid.c
@@ -7,12 +7,13 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.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>
 
@@ -40,7 +41,7 @@ size_t vtid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
-       size += lib_ring_buffer_align(offset, lttng_alignof(pid_t));
+       size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(pid_t));
        size += sizeof(pid_t);
        return size;
 }
@@ -61,12 +62,11 @@ pid_t wrapper_getvtid(void)
 static
 void vtid_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)
 {
        pid_t vtid = wrapper_getvtid();
 
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vtid));
-       chan->ops->event_write(ctx, &vtid, sizeof(vtid));
+       chan->ops->event_write(ctx, &vtid, sizeof(vtid), lttng_ust_rb_alignof(vtid));
 }
 
 static
@@ -83,8 +83,8 @@ int lttng_add_vtid_to_ctx(struct lttng_ust_ctx **ctx)
        int ret;
 
        type = lttng_ust_create_type_integer(sizeof(pid_t) * CHAR_BIT,
-                       lttng_alignof(pid_t) * CHAR_BIT,
-                       lttng_is_signed_type(pid_t),
+                       lttng_ust_rb_alignof(pid_t) * CHAR_BIT,
+                       lttng_ust_is_signed_type(pid_t),
                        BYTE_ORDER, 10);
        if (!type)
                return -ENOMEM;