Fix: napi instrumentation for 4.8 kernels

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

diff --git a/lttng-context.c b/lttng-context.c
index c2ce68d7557e5be924b4a6e901f036765b59e32b..9f5cb249c984a94ea154f0cdc2ee8f3cbf82b069 100644 (file)
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -24,9 +24,9 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
-#include "lttng-events.h"
-#include "lttng-tracer.h"
+#include <wrapper/vmalloc.h>   /* for wrapper_vmalloc_sync_all() */
+#include <lttng-events.h>
+#include <lttng-tracer.h>
 
 /*
  * The filter implementation requires that two consecutive "get" for the
@@ -56,14 +56,20 @@ EXPORT_SYMBOL_GPL(lttng_find_context);
 int lttng_get_context_index(struct lttng_ctx *ctx, const char *name)
 {
        unsigned int i;
+       const char *subname;
 
        if (!ctx)
                return -1;
+       if (strncmp(name, "$ctx.", strlen("$ctx.")) == 0) {
+               subname = name + strlen("$ctx.");
+       } else {
+               subname = name;
+       }
        for (i = 0; i < ctx->nr_fields; i++) {
                /* Skip allocated (but non-initialized) contexts */
                if (!ctx->fields[i].event_field.name)
                        continue;
-               if (!strcmp(ctx->fields[i].event_field.name, name))
+               if (!strcmp(ctx->fields[i].event_field.name, subname))
                        return i;
        }
        return -1;
@@ -226,44 +232,68 @@ int lttng_context_init(void)
 
        ret = lttng_add_hostname_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_hostname_to_ctx");
        }
        ret = lttng_add_nice_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_nice_to_ctx");
        }
        ret = lttng_add_pid_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_pthread_id_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_pid_to_ctx");
        }
        ret = lttng_add_ppid_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_ppid_to_ctx");
        }
        ret = lttng_add_prio_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_vpid_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_prio_to_ctx");
        }
        ret = lttng_add_procname_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_vtid_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
        }
        ret = lttng_add_tid_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_tid_to_ctx");
        }
        ret = lttng_add_vppid_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_vppid_to_ctx");
        }
        ret = lttng_add_vtid_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_vtid_to_ctx");
        }
        ret = lttng_add_vpid_to_ctx(&lttng_static_ctx);
        if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+               printk(KERN_WARNING "Cannot add context lttng_add_vpid_to_ctx");
+       }
+       ret = lttng_add_cpu_id_to_ctx(&lttng_static_ctx);
+       if (ret) {
+               printk(KERN_WARNING "Cannot add context lttng_add_cpu_id_to_ctx");
+       }
+       ret = lttng_add_interruptible_to_ctx(&lttng_static_ctx);
+       if (ret) {
+               printk(KERN_WARNING "Cannot add context lttng_add_interruptible_to_ctx");
+       }
+       ret = lttng_add_need_reschedule_to_ctx(&lttng_static_ctx);
+       if (ret) {
+               printk(KERN_WARNING "Cannot add context lttng_add_need_reschedule_to_ctx");
+       }
+#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT)
+       ret = lttng_add_preemptible_to_ctx(&lttng_static_ctx);
+       if (ret != -ENOSYS) {
+               printk(KERN_WARNING "Cannot add context lttng_add_preemptible_to_ctx");
+       }
+#endif
+#ifdef CONFIG_PREEMPT_RT_FULL
+       ret = lttng_add_migratable_to_ctx(&lttng_static_ctx);
+       if (ret != -ENOSYS) {
+               printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx");
        }
+#endif
        /* TODO: perf counters for filtering */
        return 0;
 }