X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Ffork%2Ffork.c;h=241ef8121484f065cd7b56fcd5816416f2dc366e;hb=93d0f2eaff675059588e958e3de74a1bb7dd4028;hp=20a08779f367cc413d2da769c0b25853797f90ec;hpb=48c56fcfaec23b51b49cbafb745b1638f8594068;p=ust.git

diff --git a/tests/fork/fork.c b/tests/fork/fork.c
index 20a0877..241ef81 100644
--- a/tests/fork/fork.c
+++ b/tests/fork/fork.c
@@ -1,17 +1,20 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/types.h>
 
-#include "marker.h"
+#include <ust/marker.h>
 
-
-int main()
+int main(int argc, char **argv, char *env[])
 {
 	int result;
 
-	printf("Fork test program\n");
-	trace_mark(ust, before_fork, MARK_NOARGS);
+	if(argc < 2 ) {
+		fprintf(stderr, "usage: fork PROG_TO_EXEC\n");
+		exit(1);
+	}
 
-	sleep(5);
+	printf("Fork test program, parent pid is %d\n", getpid());
+	trace_mark(ust, before_fork, MARK_NOARGS);
 
 	result = fork();
 	if(result == -1) {
@@ -19,7 +22,21 @@ int main()
 		return 1;
 	}
 	if(result == 0) {
+		char *args[] = {"fork2", NULL};
+
+		printf("Child pid is %d\n", getpid());
+
 		trace_mark(ust, after_fork_child, MARK_NOARGS);
+
+		trace_mark(ust, before_exec, "pid %d", getpid());
+
+		result = execve(argv[1], args, env);
+		if(result == -1) {
+			perror("execve");
+			return 1;
+		}
+
+		trace_mark(ust, after_exec, "pid %d", getpid());
 	}
 	else {
 		trace_mark(ust, after_fork_parent, MARK_NOARGS);