X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Flttng-context-prio.c;h=cbe9480030756ec1ba34bd0441626243f417f840;hb=056c40d82b02499c6692e5c01e8da59d1e0bdd17;hp=3eb3ff9056b3a3022d4cb759efd22089121b5cbf;hpb=2dc781e02eb156a76554ada092a181ab2916db57;p=lttng-modules.git

diff --git a/src/lttng-context-prio.c b/src/lttng-context-prio.c
index 3eb3ff90..cbe94800 100644
--- a/src/lttng-context-prio.c
+++ b/src/lttng-context-prio.c
@@ -14,37 +14,20 @@
 #include <lttng/events-internal.h>
 #include <ringbuffer/frontend_types.h>
 #include <wrapper/vmalloc.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_funcptr("task_prio");
-	if (!wrapper_task_prio_sym) {
-		printk(KERN_WARNING "LTTng: task_prio symbol lookup failed.\n");
-		return -EINVAL;
-	}
-	return 0;
-}
-
 /*
- * Canary function to check for 'task_prio()' at compile time.
- *
- * From 'include/linux/sched.h':
- *
- *   extern int task_prio(const struct task_struct *p);
+ * task_prio() has been implemented as p->prio - MAX_RT_PRIO since at
+ * least kernel v3.0.
  */
-__attribute__((unused)) static
-int __canary__task_prio(const struct task_struct *p)
+static
+int wrapper_task_prio(struct task_struct *p)
 {
-	return task_prio(p);
+	return p->prio - MAX_RT_PRIO;
 }
 
 static
-size_t prio_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset)
+size_t prio_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
 	size_t size = 0;
 
@@ -54,29 +37,28 @@ size_t prio_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse
 }
 
 static
-void prio_record(void *priv, struct lttng_probe_ctx *probe_ctx,
-		struct lib_ring_buffer_ctx *ctx,
-		struct lttng_channel *chan)
+void prio_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx,
+		struct lttng_kernel_ring_buffer_ctx *ctx,
+		struct lttng_kernel_channel_buffer *chan)
 {
 	int prio;
 
-	prio = wrapper_task_prio_sym(current);
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(prio));
-	chan->ops->event_write(ctx, &prio, sizeof(prio));
+	prio = wrapper_task_prio(current);
+	chan->ops->event_write(ctx, &prio, sizeof(prio), lttng_alignof(prio));
 }
 
 static
 void prio_get_value(void *priv,
-		struct lttng_probe_ctx *lttng_probe_ctx,
+		struct lttng_kernel_probe_ctx *lttng_probe_ctx,
 		struct lttng_ctx_value *value)
 {
-	value->u.s64 = wrapper_task_prio_sym(current);
+	value->u.s64 = wrapper_task_prio(current);
 }
 
 static const struct lttng_kernel_ctx_field *ctx_field = lttng_kernel_static_ctx_field(
 	lttng_kernel_static_event_field("prio",
 		lttng_kernel_static_type_integer_from_type(int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	prio_get_size,
 	prio_record,
 	prio_get_value,