Make only libust and libustconsumer use a signal safe usterr.h

[ust.git] / tests / hello / hello.c

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 4463a89f2fcf0e128302a16109f3db5ef6c2fd72..c0b541fd33d23b6c5dbecdac1933b4c0d480b40f 100644 (file)
--- 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>
@@ -8,10 +25,10 @@
 #include <signal.h>
 
 #include <ust/marker.h>
+#include <ust/ustctl.h>
 #include "usterr.h"
 #include "tp.h"
 
-
 void inthandler(int sig)
 {
        printf("in handler\n");
@@ -60,13 +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;
 }