X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-context-vpid.c;h=28178b9ead50bc3cb3b8b100bb675269cadafbe7;hp=14364b338a9e92ff834ef26480f1b1653e874ea1;hb=cd4486798c2b046ea93b89439cd705e93c40b349;hpb=06254b0fe2a909dabb889fb0d022384906f6f37a

diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c
index 14364b33..28178b9e 100644
--- a/lttng-context-vpid.c
+++ b/lttng-context-vpid.c
@@ -1,32 +1,19 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * lttng-context-vpid.c
  *
  * LTTng vPID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include "lttng-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "lttng-tracer.h"
+#include <lttng/events.h>
+#include <ringbuffer/frontend_types.h>
+#include <wrapper/vmalloc.h>
+#include <lttng/tracer.h>
 
 static
 size_t vpid_get_size(size_t offset)
@@ -56,6 +43,23 @@ void vpid_record(struct lttng_ctx_field *field,
 	chan->ops->event_write(ctx, &vpid, sizeof(vpid));
 }
 
+static
+void vpid_get_value(struct lttng_ctx_field *field,
+		struct lttng_probe_ctx *lttng_probe_ctx,
+		union lttng_ctx_value *value)
+{
+	pid_t vpid;
+
+	/*
+	 * nsproxy can be NULL when scheduled out of exit.
+	 */
+	if (!current->nsproxy)
+		vpid = 0;
+	else
+		vpid = task_tgid_vnr(current);
+	value->s64 = vpid;
+}
+
 int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
@@ -69,19 +73,17 @@ int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "vpid";
 	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 = lttng_alignof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_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 = vpid_get_size;
 	field->record = vpid_record;
-	wrapper_vmalloc_sync_all();
+	field->get_value = vpid_get_value;
+	lttng_context_update(*ctx);
+	wrapper_vmalloc_sync_mappings();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vpid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit vPID Context");