X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fkernel%2Ftest-mark.c;h=8f998b9b3d900ffcc7cac063b0fbec2a96bab570;hb=d11576c9325f522c6763201bcf68ad9f57ebafed;hp=7e2858eb27ddf83d8bab709b00b4d33d4b9b328c;hpb=f8e77313452e934cf5d1af6f3659687126e992bc;p=lttv.git

diff --git a/tests/kernel/test-mark.c b/tests/kernel/test-mark.c
index 7e2858eb..8f998b9b 100644
--- a/tests/kernel/test-mark.c
+++ b/tests/kernel/test-mark.c
@@ -6,30 +6,46 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
+#include <asm/ptrace.h>
 
-int x=7;
+volatile int x = 7;
 
 struct proc_dir_entry *pentry = NULL;
 
+static inline void test(struct pt_regs * regs)
+{
+	MARK(kernel_debug_test, "%d %ld %p", 2, regs->eip, regs);
+}
+
 static int my_open(struct inode *inode, struct file *file)
 {
-	MARK(subsys_mark1, "%d", 1);
-	MARK(subsys_mark2, "%d %s", 2, "blah2");
-	MARK(subsys_mark3, "%d %s", x, "blah3");
+	unsigned int i;
+
+	for(i=0; i<2; i++) {
+		MARK(subsys_mark1, "%d", 1);
+	}
+	MARK(subsys_mark2, "%d %s %s", 2, "blah2", "blahx");
+	MARK(subsys_mark3, "%d %s %s", x, "blah3", "blah5");
+	MARK(subsys_mark3, "%d %s %s", x, "blah3", "blah5");
+	test(NULL);
+	test(NULL);
 
 	return -EPERM;
 }
 
 
 static struct file_operations my_operations = {
-        .open = my_open,
+	.open = my_open,
 };
 
 int init_module(void)
 {
-       pentry = create_proc_entry("testmark", 0444, NULL);
-        if(pentry)
-                pentry->proc_fops = &my_operations;
+	pentry = create_proc_entry("testmark", 0444, NULL);
+	if (pentry)
+		pentry->proc_fops = &my_operations;
+
+	marker_list_probe(NULL);
+
 	return 0;
 }