Rename "tsc" to "timestamp"

[lttng-modules.git] / src / lttng-context-prio.c

diff --git a/src/lttng-context-prio.c b/src/lttng-context-prio.c
index 885c48bc8e2827fb9f802298c37dbf90d965943e..cbe9480030756ec1ba34bd0441626243f417f840 100644 (file)
--- a/src/lttng-context-prio.c
+++ b/src/lttng-context-prio.c
@@ -11,39 +11,23 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <lttng/events.h>
+#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(size_t offset)
+size_t prio_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset)
 {
        size_t size = 0;
 
@@ -53,56 +37,41 @@ size_t prio_get_size(size_t offset)
 }
 
 static
-void prio_record(struct lttng_ctx_field *field,
-               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(struct lttng_ctx_field *field,
-               struct lttng_probe_ctx *lttng_probe_ctx,
-               union lttng_ctx_value *value)
+void prio_get_value(void *priv,
+               struct lttng_kernel_probe_ctx *lttng_probe_ctx,
+               struct lttng_ctx_value *value)
 {
-       value->s64 = wrapper_task_prio_sym(current);
+       value->u.s64 = wrapper_task_prio(current);
 }
 
-int lttng_add_prio_to_ctx(struct lttng_ctx **ctx)
+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),
+       prio_get_size,
+       prio_record,
+       prio_get_value,
+       NULL, NULL);
+
+int lttng_add_prio_to_ctx(struct lttng_kernel_ctx **ctx)
 {
-       struct lttng_ctx_field *field;
        int ret;
 
-       if (!wrapper_task_prio_sym) {
-               ret = wrapper_task_prio_init();
-               if (ret)
-                       return ret;
-       }
-
-       field = lttng_append_context(ctx);
-       if (!field)
-               return -ENOMEM;
-       if (lttng_find_context(*ctx, "prio")) {
-               lttng_remove_context_field(ctx, field);
+       if (lttng_kernel_find_context(*ctx, ctx_field->event_field->name))
                return -EEXIST;
-       }
-       field->event_field.name = "prio";
-       field->event_field.type.type = lttng_kernel_type_integer;
-       field->event_field.type.u.integer.size = sizeof(int) * CHAR_BIT;
-       field->event_field.type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-       field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
-       field->event_field.type.u.integer.reverse_byte_order = 0;
-       field->event_field.type.u.integer.base = 10;
-       field->event_field.type.u.integer.encoding = lttng_encode_none;
-       field->get_size = prio_get_size;
-       field->record = prio_record;
-       field->get_value = prio_get_value;
-       lttng_context_update(*ctx);
+       ret = lttng_kernel_context_append(ctx, ctx_field);
        wrapper_vmalloc_sync_mappings();
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL_GPL(lttng_add_prio_to_ctx);