Session create/release tested.

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

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 4463a89f2fcf0e128302a16109f3db5ef6c2fd72..e8eb78efc93adc2779f681825aca79e95adec909 100644 (file)
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * License as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * 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>
@@ -6,16 +25,14 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <string.h>
 
-#include <ust/marker.h>
-#include "usterr.h"
-#include "tp.h"
-
+#include "ust_tests_hello.h"
 
 void inthandler(int sig)
 {
-       printf("in handler\n");
-       exit(0);
+       printf("in SIGUSR1 handler\n");
+       tracepoint(ust_tests_hello_tptest_sighandler);
 }
 
 int init_int_handler(void)
@@ -23,9 +40,10 @@ int init_int_handler(void)
        int result;
        struct sigaction act;
 
+       memset(&act, 0, sizeof(act));
        result = sigemptyset(&act.sa_mask);
-       if(result == -1) {
-               PERROR("sigemptyset");
+       if (result == -1) {
+               perror("sigemptyset");
                return -1;
        }
 
@@ -35,38 +53,33 @@ int init_int_handler(void)
        /* Only defer ourselves. Also, try to restart interrupted
         * syscalls to disturb the traced program as little as possible.
         */
-       result = sigaction(SIGINT, &act, NULL);
-       if(result == -1) {
-               PERROR("sigaction");
+       result = sigaction(SIGUSR1, &act, NULL);
+       if (result == -1) {
+               perror("sigaction");
                return -1;
        }
 
        return 0;
 }
 
-int main()
+int main(int argc, char **argv)
 {
        int i;
+       long values[] = { 1, 2, 3 };
+       char text[10] = "test";
+       double dbl = 2.0;
+       float flt = 2222.0;
 
        init_int_handler();
 
        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++) {
+               tracepoint(ust_tests_hello_tptest, i, values,
+                          text, strlen(text), dbl, flt);
                usleep(100000);
        }
-
-       scanf("%*s");
-
-       ltt_trace_stop("auto");
-       ltt_trace_destroy("auto");
-
-       DBG("TRACE STOPPED");
-       scanf("%*s");
-
        return 0;
 }