Migrate tracepoint instrumentation to TP_FIELDS

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

diff --git a/lttng-context.c b/lttng-context.c
index b625f4391de8d40d634c436ec04253b1808ab81d..c2ce68d7557e5be924b4a6e901f036765b59e32b 100644 (file)
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -224,48 +224,47 @@ int lttng_context_init(void)
 {
        int ret;
 
-       ret = lttng_add_vpid_to_ctx(&lttng_static_ctx);
+       ret = lttng_add_hostname_to_ctx(&lttng_static_ctx);
+       if (ret) {
+               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
+       }
+       ret = lttng_add_nice_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
        }
-#if 0  //TODO
        ret = lttng_add_pid_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_pthread_id_to_ctx");
        }
-       ret = lttng_add_procname_to_ctx(&lttng_static_ctx);
+       ret = lttng_add_ppid_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_prio_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_vpid_to_ctx");
        }
-       ret = lttng_add_nice_to_ctx(&lttng_static_ctx);
+       ret = lttng_add_procname_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_tid_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
        }
-       ret = lttng_add_vtid_to_ctx(&lttng_static_ctx);
-       if (ret) {
-               printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
-       }
-       ret = lttng_add_ppid_to_ctx(&lttng_static_ctx);
+       ret = lttng_add_vppid_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
        }
-       ret = lttng_add_vppid_to_ctx(&lttng_static_ctx);
+       ret = lttng_add_vtid_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
        }
-       ret = lttng_add_hostname_to_ctx(&lttng_static_ctx);
+       ret = lttng_add_vpid_to_ctx(&lttng_static_ctx);
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_procname_to_ctx");
        }
-#endif
+       /* TODO: perf counters for filtering */
        return 0;
 }