Move alignment into event write callback

[lttng-modules.git] / src / lttng-context-sgid.c

diff --git a/src/lttng-context-sgid.c b/src/lttng-context-sgid.c
index 28a448773f45b7729b33eccc598b079f808dbd46..dde6f71326fb88d18d07c77487000fa11e665365 100644 (file)
--- a/src/lttng-context-sgid.c
+++ b/src/lttng-context-sgid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 static
-size_t sgid_get_size(size_t offset)
+size_t sgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -29,23 +29,22 @@ size_t sgid_get_size(size_t offset)
 }
 
 static
-void sgid_record(struct lttng_kernel_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void sgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
+                struct lttng_kernel_channel_buffer *chan)
 {
        gid_t sgid;
 
        sgid = lttng_current_sgid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(sgid));
-       chan->ops->event_write(ctx, &sgid, sizeof(sgid));
+       chan->ops->event_write(ctx, &sgid, sizeof(sgid), lttng_alignof(sgid));
 }
 
 static
-void sgid_get_value(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void sgid_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
-       value->s64 = lttng_current_sgid();
+       value->u.s64 = lttng_current_sgid();
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
@@ -53,7 +52,6 @@ static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_
                lttng_kernel_static_type_integer_from_type(gid_t, __BYTE_ORDER, 10),
                false, false, false),
        sgid_get_size,
-       NULL,
        sgid_record,
        sgid_get_value,
        NULL, NULL);