X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fhello%2Fhello.c;h=bb44773daa8ee83d1e11cd8b0be97e9843c71b11;hb=8161463975e218e0833d31ab1577a7ceb9e8e9f3;hp=86c5c71cacc9f4f27ee8308db3bffde85528db0e;hpb=a09dac63957396890b1085cac0fee92ecc5db87a;p=ust.git

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 86c5c71..bb44773 100644
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+/*
+ * Copyright (C) 2009  Pierre-Marc Fournier
+ * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,9 +27,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)
 {
@@ -41,7 +43,7 @@ int init_int_handler(void)
 	struct sigaction act;
 
 	result = sigemptyset(&act.sa_mask);
-	if(result == -1) {
+	if (result == -1) {
 		PERROR("sigemptyset");
 		return -1;
 	}
@@ -53,7 +55,7 @@ int init_int_handler(void)
 	 * syscalls to disturb the traced program as little as possible.
 	 */
 	result = sigaction(SIGINT, &act, NULL);
-	if(result == -1) {
+	if (result == -1) {
 		PERROR("sigaction");
 		return -1;
 	}
@@ -70,20 +72,22 @@ int main()
 	printf("Hello, World!\n");
 
 	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_hello_tptest(i);
+	for (i = 0; i < 50; i++) {
+		ust_marker(bar, "str %s", "FOOBAZ");
+		ust_marker(bar2, "number1 %d number2 %d", 53, 9800);
+		tracepoint(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;
 }