Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-vgid.c b/src/lttng-context-vgid.c
index 00dd91d6e592764f5cca16a78d59388fa80032db..a5a51bfb26477c224e51fa167c932a7936dd2de4 100644 (file)
--- a/src/lttng-context-vgid.c
+++ b/src/lttng-context-vgid.c
@@ -11,15 +11,16 @@
 
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/user_namespace.h>
+
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.h>
-#include <wrapper/user_namespace.h>
 
 static
-size_t vgid_get_size(size_t offset)
+size_t vgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -29,31 +30,29 @@ size_t vgid_get_size(size_t offset)
 }
 
 static
-void vgid_record(struct lttng_kernel_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void vgid_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 vgid;
 
-       vgid = lttng_current_vgid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vgid));
-       chan->ops->event_write(ctx, &vgid, sizeof(vgid));
+       vgid = from_kgid_munged(current_user_ns(), current_gid());
+       chan->ops->event_write(ctx, &vgid, sizeof(vgid), lttng_alignof(vgid));
 }
 
 static
-void vgid_get_value(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void vgid_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
-       value->s64 = lttng_current_vgid();
+       value->u.s64 = from_kgid_munged(current_user_ns(), current_gid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("vgid",
                lttng_kernel_static_type_integer_from_type(gid_t, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        vgid_get_size,
-       NULL,
        vgid_record,
        vgid_get_value,
        NULL, NULL);