X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fhello%2Fhello.c;h=c0b541fd33d23b6c5dbecdac1933b4c0d480b40f;hb=30ffe2794fc413035208cdd2a7a061bc208e210f;hp=102b7db258ce566daff95bc2ce540c629a75d1f8;hpb=6dd969b5dd702909b8eb827e850c851053774055;p=ust.git

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 102b7db..c0b541f 100644
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -1,3 +1,20 @@
+/* Copyright (C) 2009  Pierre-Marc Fournier
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -7,14 +24,11 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#include "marker.h"
+#include <ust/marker.h>
+#include <ust/ustctl.h>
 #include "usterr.h"
-#include "tracer.h"
-#include "marker-control.h"
-#include "relay.h"
 #include "tp.h"
 
-
 void inthandler(int sig)
 {
 	printf("in handler\n");
@@ -49,7 +63,6 @@ int init_int_handler(void)
 
 int main()
 {
-	int result;
 	int i;
 
 	init_int_handler();
@@ -64,16 +77,15 @@ int main()
 		usleep(100000);
 	}
 
-	scanf("%*s");
+	if (scanf("%*s") == EOF)
+		PERROR("scanf failed");
 
-	ltt_trace_stop("auto");
-	ltt_trace_destroy("auto");
+	ustctl_stop_trace(getpid(), "auto");
+	ustctl_destroy_trace(getpid(), "auto");
 
 	DBG("TRACE STOPPED");
-	scanf("%*s");
+	if (scanf("%*s") == EOF)
+		PERROR("scanf failed");
 
 	return 0;
 }
-
-MARKER_LIB;
-TRACEPOINT_LIB;