Fix: tls-compat with hidden ring buffer context

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

diff --git a/liblttng-ust/lttng-context-vegid.c b/liblttng-ust/lttng-context-vegid.c
index d1a21a6e22ddb0505ef99dc4b642f477faf2cbe5..a6306f3c6e1865064d8984add57eda810b2fb2ba 100644 (file)
--- a/liblttng-ust/lttng-context-vegid.c
+++ b/liblttng-ust/lttng-context-vegid.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 "context-internal.h"
 #include "creds.h"
@@ -65,7 +66,7 @@ size_t vegid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
-       size += lib_ring_buffer_align(offset, lttng_alignof(gid_t));
+       size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(gid_t));
        size += sizeof(gid_t);
        return size;
 }
@@ -73,13 +74,12 @@ size_t vegid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void vegid_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)
 {
        gid_t vegid;
 
        vegid = get_vegid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vegid));
-       chan->ops->event_write(ctx, &vegid, sizeof(vegid));
+       chan->ops->event_write(ctx, &vegid, sizeof(vegid), lttng_ust_rb_alignof(vegid));
 }
 
 static
@@ -96,8 +96,8 @@ int lttng_add_vegid_to_ctx(struct lttng_ust_ctx **ctx)
        int ret;
 
        type = lttng_ust_create_type_integer(sizeof(gid_t) * CHAR_BIT,
-                       lttng_alignof(gid_t) * CHAR_BIT,
-                       lttng_is_signed_type(gid_t),
+                       lttng_ust_rb_alignof(gid_t) * CHAR_BIT,
+                       lttng_ust_is_signed_type(gid_t),
                        BYTE_ORDER, 10);
        if (!type)
                return -ENOMEM;