X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fhello%2Fhello.c;h=058f7fae10abaa2c7c5a957c1bdc80fe40f8f8f1;hb=a7fdc0c19ae60515cd1d8417d07bf6e1a5cbc781;hp=d30901a5517108a5e6c67135e2b279a25a9e181b;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index d30901a5..058f7fae 100644
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -25,14 +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 "usterr.h"
-#include "tp.h"
+#define TRACEPOINT_DEFINE
+#include "ust_tests_hello.h"
 
 void inthandler(int sig)
 {
 	printf("in SIGUSR1 handler\n");
-	tracepoint(ust_tests_hello_tptest_sighandler);
+	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");
+		perror("sigemptyset");
 		return -1;
 	}
 
@@ -54,26 +64,41 @@ int init_int_handler(void)
 	 */
 	result = sigaction(SIGUSR1, &act, NULL);
 	if (result == -1) {
-		PERROR("sigaction");
+		perror("sigaction");
 		return -1;
 	}
 
 	return 0;
 }
 
+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");
+	if (argc == 2)
+		delay = atoi(argv[1]);
+
+	fprintf(stderr, "Hello, World!\n");
 
-	sleep(1);
+	sleep(delay);
 
-	for (i = 0; i < 50; i++) {
-		tracepoint(ust_tests_hello_tptest, i);
-		usleep(100000);
+	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;
 }