Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-context-vsuid.c b/src/lttng-context-vsuid.c
index 82a8a4727c80db9f68d0d96966b5a483c53d6f8d..e48654c8ebb93343f04a120f51a8955e16a58463 100644 (file)
--- a/src/lttng-context-vsuid.c
+++ b/src/lttng-context-vsuid.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 vsuid_get_size(size_t offset)
+size_t vsuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -29,31 +30,29 @@ size_t vsuid_get_size(size_t offset)
 }
 
 static
-void vsuid_record(struct lttng_kernel_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
-                struct lttng_channel *chan)
+void vsuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+                struct lttng_kernel_ring_buffer_ctx *ctx,
+                struct lttng_kernel_channel_buffer *chan)
 {
        uid_t vsuid;
 
-       vsuid = lttng_current_vsuid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsuid));
-       chan->ops->event_write(ctx, &vsuid, sizeof(vsuid));
+       vsuid = from_kuid_munged(current_user_ns(), current_suid());
+       chan->ops->event_write(ctx, &vsuid, sizeof(vsuid), lttng_alignof(vsuid));
 }
 
 static
-void vsuid_get_value(struct lttng_kernel_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void vsuid_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
-       value->s64 = lttng_current_vsuid();
+       value->u.s64 = from_kuid_munged(current_user_ns(), current_suid());
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
        lttng_kernel_static_event_field("vsuid",
                lttng_kernel_static_type_integer_from_type(uid_t, __BYTE_ORDER, 10),
-               false, false, false),
+               false, false),
        vsuid_get_size,
-       NULL,
        vsuid_record,
        vsuid_get_value,
        NULL, NULL);