X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-context-prio.c;h=fee0dc146c1657896aa915e2a7cedc181235c3bb;hb=a90917c3f8c4ed79117f1caa333b29a2108084ec;hp=d159e02d4dbf270bcd3059e31d6fc41e88120b31;hpb=979133c547728a541098dd7051e1e72ab7631788;p=lttng-modules.git

diff --git a/lttng-context-prio.c b/lttng-context-prio.c
index d159e02d..fee0dc14 100644
--- a/lttng-context-prio.c
+++ b/lttng-context-prio.c
@@ -10,17 +10,18 @@
 #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 "wrapper/kallsyms.h"
+#include "lttng-tracer.h"
 
 static
 int (*wrapper_task_prio_sym)(struct task_struct *t);
 
 int wrapper_task_prio_init(void)
 {
-	wrapper_task_prio_sym = (void *) kallsyms_lookup_name("task_prio");
+	wrapper_task_prio_sym = (void *) kallsyms_lookup_funcptr("task_prio");
 	if (!wrapper_task_prio_sym) {
 		printk(KERN_WARNING "LTTng: task_prio symbol lookup failed.\n");
 		return -EINVAL;
@@ -33,7 +34,7 @@ size_t prio_get_size(size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, ltt_alignof(int));
+	size += lib_ring_buffer_align(offset, lttng_alignof(int));
 	size += sizeof(int);
 	return size;
 }
@@ -41,12 +42,12 @@ size_t prio_get_size(size_t offset)
 static
 void prio_record(struct lttng_ctx_field *field,
 		struct lib_ring_buffer_ctx *ctx,
-		struct ltt_channel *chan)
+		struct lttng_channel *chan)
 {
 	int prio;
 
 	prio = wrapper_task_prio_sym(current);
-	lib_ring_buffer_align_ctx(ctx, ltt_alignof(prio));
+	lib_ring_buffer_align_ctx(ctx, lttng_alignof(prio));
 	chan->ops->event_write(ctx, &prio, sizeof(prio));
 }
 
@@ -63,11 +64,15 @@ int lttng_add_prio_to_ctx(struct lttng_ctx **ctx)
 
 	field = lttng_append_context(ctx);
 	if (!field)
-		return ret;
+		return -ENOMEM;
+	if (lttng_find_context(*ctx, "prio")) {
+		lttng_remove_context_field(ctx, field);
+		return -EEXIST;
+	}
 	field->event_field.name = "prio";
 	field->event_field.type.atype = atype_integer;
 	field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = ltt_alignof(int) * CHAR_BIT;
+	field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT;
 	field->event_field.type.u.basic.integer.signedness = is_signed_type(int);
 	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
 	field->event_field.type.u.basic.integer.base = 10;