X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context.c;h=eca58ce1873b3ab18c25001ac362a086dda6ecbd;hb=refs%2Fheads%2Fstable-2.7;hp=b625f4391de8d40d634c436ec04253b1808ab81d;hpb=07dfc1d0e4b093ad02682499a702dc11e54e8302;p=lttng-modules.git

diff --git a/lttng-context.c b/lttng-context.c
index b625f439..eca58ce1 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -224,48 +224,51 @@ 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");
+		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_nice_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");
+		printk(KERN_WARNING "Cannot add context lttng_add_pid_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_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_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");
 	}
 	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_vtid_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");
+		printk(KERN_WARNING "Cannot add context lttng_add_vppid_to_ctx");
 	}
-	ret = lttng_add_ppid_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");
+		printk(KERN_WARNING "Cannot add context lttng_add_vtid_to_ctx");
 	}
-	ret = lttng_add_vppid_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");
+		printk(KERN_WARNING "Cannot add context lttng_add_vpid_to_ctx");
 	}
-	ret = lttng_add_hostname_to_ctx(&lttng_static_ctx);
+	ret = lttng_add_cpu_id_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_cpu_id_to_ctx");
 	}
-#endif
+	/* TODO: perf counters for filtering */
 	return 0;
 }