From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Fri, 15 Feb 2008 22:41:22 +0000 (+0000)
Subject: update
X-Git-Tag: v0.12.20~672
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=3c23bb5be6b3a3c5b4b94e4153d770b67ed12f69;p=lttv.git

update

git-svn-id: http://ltt.polymtl.ca/svn@2817 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/markers-userspace/kernel-api.h b/markers-userspace/kernel-api.h
index 6172ad52..f972fe18 100644
--- a/markers-userspace/kernel-api.h
+++ b/markers-userspace/kernel-api.h
@@ -38,6 +38,7 @@ extern "C" {
 #define _imv_read(name)		(name##__imv)
 
 #define __NR_marker             328
+#define __NR_trace              329
 
 #define sys_marker(...) syscall(__NR_marker, __VA_ARGS__)
 
diff --git a/markers-userspace/marker-lib.c b/markers-userspace/marker-lib.c
index c13c9eec..b2165b8b 100644
--- a/markers-userspace/marker-lib.c
+++ b/markers-userspace/marker-lib.c
@@ -39,9 +39,13 @@ __attribute__ ((visibility ("protected")))
 void marker_probe_cb(const struct marker *mdata, void *call_private,
 	const char *fmt, ...)
 {
-	static unsigned int count = 0;
+	char buf[PAGE_SIZE];
+	va_list ap;
 
-	printf("Test probe function %u\n", count++);
+	va_start(ap, fmt);
+	vsnprintf(buf, PAGE_SIZE-1, fmt, ap);
+	sys_trace(0, 0, buf);
+	va_end(ap);
 }
 
 //FIXME : imv_read won't work with optimized immediate values.
diff --git a/markers-userspace/testprog.c b/markers-userspace/testprog.c
index 5c3010a8..0dedac6a 100644
--- a/markers-userspace/testprog.c
+++ b/markers-userspace/testprog.c
@@ -9,10 +9,11 @@ int main(int argc, char **argv)
 	void *ptr;
 	unsigned long val;
 
-	while (1) {
+	//while (1) {
 		trace_mark(test_marker, "ptr %p val %lu", ptr, val);
 		testfct();
 		sleep(2);
-	}
+	//}
+	execl("/bin/ls", NULL);
 	return 0;
 }