X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fhello%2Fhello.c;h=058f7fae10abaa2c7c5a957c1bdc80fe40f8f8f1;hb=de713d8a77cbd77e60f58537b0fc222f98fde395;hp=6ba2e61e06963f2ea1478147569725263e2f3cc9;hpb=37ee34e4d9b9363c758aa43255d71661900e89b0;p=lttng-ust.git

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 6ba2e61e..058f7fae 100644
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -1,9 +1,11 @@
-/* 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
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * 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
@@ -23,16 +25,23 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <string.h>
+/*
+ * Work-around inet.h missing struct mmsghdr forward declaration, with
+ * triggers a warning when system files warnings are enabled.
+ */
+struct mmsghdr;
+#include <arpa/inet.h>
+#include <stdlib.h>
+#include <stdbool.h>
 
-#include <ust/marker.h>
-#include <ust/ustctl.h>
-#include "usterr.h"
-#include "tp.h"
+#define TRACEPOINT_DEFINE
+#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)
@@ -40,9 +49,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;
 	}
 
@@ -52,40 +62,43 @@ 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()
+void test_inc_count(void);
+
+int main(int argc, char **argv)
 {
-	int i;
+	int i, netint;
+	long values[] = { 1, 2, 3 };
+	char text[10] = "test";
+	double dbl = 2.0;
+	float flt = 2222.0;
+	int delay = 0;
+	bool mybool = 123;	/* should print "1" */
 
 	init_int_handler();
 
-	printf("Hello, World!\n");
-
-	sleep(1);
-	for(i=0; i<50; i++) {
-		trace_mark(bar, "str %s", "FOOBAZ");
-		trace_mark(bar2, "number1 %d number2 %d", 53, 9800);
-		trace_hello_tptest(i);
-		usleep(100000);
-	}
-
-	if (scanf("%*s") == EOF)
-		PERROR("scanf failed");
+	if (argc == 2)
+		delay = atoi(argv[1]);
 
-	ustctl_stop_trace(getpid(), "auto");
-	ustctl_destroy_trace(getpid(), "auto");
+	fprintf(stderr, "Hello, World!\n");
 
-	DBG("TRACE STOPPED");
-	if (scanf("%*s") == EOF)
-		PERROR("scanf failed");
+	sleep(delay);
 
+	fprintf(stderr, "Tracing... ");
+	for (i = 0; i < 1000000; i++) {
+		netint = htonl(i);
+		tracepoint(ust_tests_hello, tptest, i, netint, values,
+			   text, strlen(text), dbl, flt, mybool);
+		//usleep(100000);
+	}
+	fprintf(stderr, " done.\n");
 	return 0;
 }