Fix: pass private data to context callbacks

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

diff --git a/liblttng-ust/lttng-context-vsuid.c b/liblttng-ust/lttng-context-vsuid.c
index 3413c3a9cb3147f7fe0f12e0f1db4b58be2ce4cd..fa7f3a10ffd90e6873f6ec210f2d1b6e5f039f0e 100644 (file)
--- a/liblttng-ust/lttng-context-vsuid.c
+++ b/liblttng-ust/lttng-context-vsuid.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -65,71 +66,59 @@ void lttng_context_vsuid_reset(void)
 }
 
 static
-size_t vsuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t vsuid_get_size(void *priv __attribute__((unused)),
+               size_t offset)
 {
        size_t size = 0;
 
-       size += lib_ring_buffer_align(offset, lttng_alignof(uid_t));
+       size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uid_t));
        size += sizeof(uid_t);
        return size;
 }
 
 static
-void vsuid_record(struct lttng_ust_ctx_field *field,
+void vsuid_record(void *priv __attribute__((unused)),
                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct lttng_ust_channel_buffer *chan)
 {
        uid_t vsuid;
 
        vsuid = get_vsuid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsuid));
-       chan->ops->event_write(ctx, &vsuid, sizeof(vsuid));
+       chan->ops->event_write(ctx, &vsuid, sizeof(vsuid), lttng_ust_rb_alignof(vsuid));
 }
 
 static
-void vsuid_get_value(struct lttng_ust_ctx_field *field,
+void vsuid_get_value(void *priv __attribute__((unused)),
                struct lttng_ust_ctx_value *value)
 {
        value->u.s64 = get_vsuid();
 }
 
+static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+       lttng_ust_static_event_field("vsuid",
+               lttng_ust_static_type_integer(sizeof(uid_t) * CHAR_BIT,
+                               lttng_ust_rb_alignof(uid_t) * CHAR_BIT,
+                               lttng_ust_is_signed_type(uid_t),
+                               BYTE_ORDER, 10),
+               false, false),
+       vsuid_get_size,
+       vsuid_record,
+       vsuid_get_value,
+       NULL, NULL);
+
 int lttng_add_vsuid_to_ctx(struct lttng_ust_ctx **ctx)
 {
-       struct lttng_ust_ctx_field *field;
-       struct lttng_ust_type_common *type;
        int ret;
 
-       type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
-                       lttng_alignof(uid_t) * CHAR_BIT,
-                       lttng_is_signed_type(uid_t),
-                       BYTE_ORDER, 10);
-       if (!type)
-               return -ENOMEM;
-       field = lttng_append_context(ctx);
-       if (!field) {
-               ret = -ENOMEM;
-               goto error_context;
-       }
-       if (lttng_find_context(*ctx, "vsuid")) {
+       if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
                ret = -EEXIST;
                goto error_find_context;
        }
-       field->event_field->name = strdup("vsuid");
-       if (!field->event_field->name) {
-               ret = -ENOMEM;
-               goto error_name;
-       }
-       field->event_field->type = type;
-       field->get_size = vsuid_get_size;
-       field->record = vsuid_record;
-       field->get_value = vsuid_get_value;
-       lttng_context_update(*ctx);
+       ret = lttng_ust_context_append(ctx, ctx_field);
+       if (ret)
+               return ret;
        return 0;
 
-error_name:
 error_find_context:
-       lttng_remove_context_field(ctx, field);
-error_context:
-       lttng_ust_destroy_type(type);
        return ret;
 }