X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=tests%2Fhello%2Fhello.c;h=6ba2e61e06963f2ea1478147569725263e2f3cc9;hp=86c5c71cacc9f4f27ee8308db3bffde85528db0e;hb=37ee34e4d9b9363c758aa43255d71661900e89b0;hpb=a09dac63957396890b1085cac0fee92ecc5db87a

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 86c5c71..6ba2e61 100644
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -25,9 +25,9 @@
 #include <signal.h>
 
 #include <ust/marker.h>
+#include <ust/ustctl.h>
 #include "usterr.h"
 #include "tp.h"
-#include "tracer.h"
 
 void inthandler(int sig)
 {
@@ -71,19 +71,21 @@ int main()
 
 	sleep(1);
 	for(i=0; i<50; i++) {
-		trace_mark(ust, bar, "str %s", "FOOBAZ");
-		trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
+		trace_mark(bar, "str %s", "FOOBAZ");
+		trace_mark(bar2, "number1 %d number2 %d", 53, 9800);
 		trace_hello_tptest(i);
 		usleep(100000);
 	}
 
-	scanf("%*s");
+	if (scanf("%*s") == EOF)
+		PERROR("scanf failed");
 
-	ltt_trace_stop("auto");
-	ltt_trace_destroy("auto", 0);
+	ustctl_stop_trace(getpid(), "auto");
+	ustctl_destroy_trace(getpid(), "auto");
 
 	DBG("TRACE STOPPED");
-	scanf("%*s");
+	if (scanf("%*s") == EOF)
+		PERROR("scanf failed");
 
 	return 0;
 }