Markers: remove channel name from trace_mark()

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

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index c48b6df53359474c1410323bbf3f4a3631766093..6ba2e61e06963f2ea1478147569725263e2f3cc9 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");
@@ -54,22 +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");
+       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;