X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-context-pid.c;h=f548e3c647163a7606e990a7e90a690e769149a1;hb=a90917c3f8c4ed79117f1caa333b29a2108084ec;hp=ddd78a5d8dfb3f4b4e0eb296286a8c6d1a8cde3f;hpb=53f1f0ca4eb1890673992697c19e4e1507ec4ac5;p=lttng-modules.git

diff --git a/lttng-context-pid.c b/lttng-context-pid.c
index ddd78a5d..f548e3c6 100644
--- a/lttng-context-pid.c
+++ b/lttng-context-pid.c
@@ -10,17 +10,17 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include "ltt-events.h"
+#include "lttng-events.h"
 #include "wrapper/ringbuffer/frontend_types.h"
 #include "wrapper/vmalloc.h"
-#include "ltt-tracer.h"
+#include "lttng-tracer.h"
 
 static
 size_t pid_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,27 +28,30 @@ size_t pid_get_size(size_t offset)
 static
 void pid_record(struct lttng_ctx_field *field,
 		struct lib_ring_buffer_ctx *ctx,
-		struct ltt_channel *chan)
+		struct lttng_channel *chan)
 {
 	pid_t pid;
 
-	pid = current->pid;
-	lib_ring_buffer_align_ctx(ctx, ltt_alignof(pid));
+	pid = task_tgid_nr(current);
+	lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid));
 	chan->ops->event_write(ctx, &pid, sizeof(pid));
 }
 
 int lttng_add_pid_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, "pid")) {
+		lttng_remove_context_field(ctx, field);
+		return -EEXIST;
+	}
 	field->event_field.name = "pid";
 	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.alignment = lttng_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;