X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-context-vtid.c;h=3b0cadc4c3f01a679cf91d9d3062f8302b1c0ef9;hp=264bbb3011da08760bbb85697de1bf64f1f6f048;hb=cd4486798c2b046ea93b89439cd705e93c40b349;hpb=90f96adf9b02ecdb8c982bfda64fbfd4b11c34a8

diff --git a/lttng-context-vtid.c b/lttng-context-vtid.c
index 264bbb30..3b0cadc4 100644
--- a/lttng-context-vtid.c
+++ b/lttng-context-vtid.c
@@ -1,26 +1,26 @@
-/*
- * (C) Copyright	2009-2011 -
- * 		Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
+ * lttng-context-vtid.c
  *
  * LTTng vTID context.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include "ltt-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "ltt-tracer.h"
+#include <lttng/events.h>
+#include <ringbuffer/frontend_types.h>
+#include <wrapper/vmalloc.h>
+#include <lttng/tracer.h>
 
 static
 size_t vtid_get_size(size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, ltt_alignof(pid_t));
+	size += lib_ring_buffer_align(offset, lttng_alignof(pid_t));
 	size += sizeof(pid_t);
 	return size;
 }
@@ -28,7 +28,7 @@ size_t vtid_get_size(size_t offset)
 static
 void vtid_record(struct lttng_ctx_field *field,
 		 struct lib_ring_buffer_ctx *ctx,
-		 struct ltt_channel *chan)
+		 struct lttng_channel *chan)
 {
 	pid_t vtid;
 
@@ -39,10 +39,27 @@ void vtid_record(struct lttng_ctx_field *field,
 		vtid = 0;
 	else
 		vtid = task_pid_vnr(current);
-	lib_ring_buffer_align_ctx(ctx, ltt_alignof(vtid));
+	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vtid));
 	chan->ops->event_write(ctx, &vtid, sizeof(vtid));
 }
 
+static
+void vtid_get_value(struct lttng_ctx_field *field,
+		struct lttng_probe_ctx *lttng_probe_ctx,
+		union lttng_ctx_value *value)
+{
+	pid_t vtid;
+
+	/*
+	 * nsproxy can be NULL when scheduled out of exit.
+	 */
+	if (!current->nsproxy)
+		vtid = 0;
+	else
+		vtid = task_pid_vnr(current);
+	value->s64 = vtid;
+}
+
 int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
@@ -56,19 +73,17 @@ int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "vtid";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = ltt_alignof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = is_signed_type(pid_t);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.size = sizeof(pid_t) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(pid_t);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = vtid_get_size;
 	field->record = vtid_record;
-	wrapper_vmalloc_sync_all();
+	field->get_value = vtid_get_value;
+	lttng_context_update(*ctx);
+	wrapper_vmalloc_sync_mappings();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vtid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit vTID Context");