X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-context-vpid.c;h=3f16e03a6d996992107cbfe6eac19bb2e52dbf76;hb=950f5c99af3e6cc7be0c852df714d30ae1326bca;hp=3bbb87f413f25512b5b393eebaeb8110c16e1485;hpb=b64bc438d1c9bbcf241c598ca9f0e00d5770d784;p=lttng-modules.git

diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c
index 3bbb87f4..3f16e03a 100644
--- a/lttng-context-vpid.c
+++ b/lttng-context-vpid.c
@@ -32,7 +32,13 @@ void vpid_record(struct lttng_ctx_field *field,
 {
 	pid_t vpid;
 
-	vpid = task_tgid_vnr(current);
+	/*
+	 * nsproxy can be NULL when scheduled out of exit.
+	 */
+	if (!current->nsproxy)
+		vpid = 0;
+	else
+		vpid = task_tgid_vnr(current);
 	lib_ring_buffer_align_ctx(ctx, ltt_alignof(vpid));
 	chan->ops->event_write(ctx, &vpid, sizeof(vpid));
 }
@@ -40,11 +46,14 @@ void vpid_record(struct lttng_ctx_field *field,
 int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
-	int ret;
 
 	field = lttng_append_context(ctx);
 	if (!field)
-		return ret;
+		return -ENOMEM;
+	if (lttng_find_context(*ctx, "vpid")) {
+		lttng_remove_context_field(ctx, field);
+		return -EEXIST;
+	}
 	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;