X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-context-tid.c;h=af59d7b8375a61722387a102a750bcc7bd7becc3;hb=3e8b3fb853ead73ecbebdd8cf80d3a69c89567b7;hp=f207d986af5bbf15f979d27c254701d35b5c7e8b;hpb=09fec6b43d11b3e0ece36f9e9e44b9627c1b565d;p=lttng-modules.git

diff --git a/lttng-context-tid.c b/lttng-context-tid.c
index f207d986..af59d7b8 100644
--- a/lttng-context-tid.c
+++ b/lttng-context-tid.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 tid_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,12 +28,12 @@ size_t tid_get_size(size_t offset)
 static
 void tid_record(struct lttng_ctx_field *field,
 		 struct lib_ring_buffer_ctx *ctx,
-		 struct ltt_channel *chan)
+		 struct lttng_channel *chan)
 {
 	pid_t tid;
 
 	tid = task_pid_nr(current);
-	lib_ring_buffer_align_ctx(ctx, ltt_alignof(tid));
+	lib_ring_buffer_align_ctx(ctx, lttng_alignof(tid));
 	chan->ops->event_write(ctx, &tid, sizeof(tid));
 }
 
@@ -44,10 +44,14 @@ int lttng_add_tid_to_ctx(struct lttng_ctx **ctx)
 	field = lttng_append_context(ctx);
 	if (!field)
 		return -ENOMEM;
+	if (lttng_find_context(*ctx, "tid")) {
+		lttng_remove_context_field(ctx, field);
+		return -EEXIST;
+	}
 	field->event_field.name = "tid";
 	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;