From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 25 Sep 2011 03:32:55 +0000 (-0400)
Subject: Use network byte order field in hello test
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=9a396c3c901b720374bebc79d1bb9ab8f234ba38;p=ust.git

Use network byte order field in hello test

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/hello/hello.c b/tests/hello/hello.c
index 03d07b6..661ed40 100644
--- a/tests/hello/hello.c
+++ b/tests/hello/hello.c
@@ -26,6 +26,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <string.h>
+#include <arpa/inet.h>
 
 #include "ust_tests_hello.h"
 
@@ -64,7 +65,7 @@ int init_int_handler(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;
@@ -78,7 +79,8 @@ int main(int argc, char **argv)
 
 	//for (i = 0; i < 50; i++) {
 	for (i = 0; i < 1000000; i++) {
-		tracepoint(ust_tests_hello_tptest, i, values,
+		netint = htonl(i);
+		tracepoint(ust_tests_hello_tptest, i, netint, values,
 			   text, strlen(text), dbl, flt);
 		//usleep(100000);
 	}
diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 34d7b90..9e5043d 100644
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -29,17 +29,17 @@ extern "C" {
 #include <ust/tracepoint.h>
 
 TRACEPOINT_EVENT(ust_tests_hello_tptest,
-	TP_PROTO(int anint, long *values,
+	TP_PROTO(int anint, int netint, long *values,
 		 char *text, size_t textlen,
 		 double doublearg, float floatarg),
-	TP_ARGS(anint, values, text, textlen,
+	TP_ARGS(anint, netint, values, text, textlen,
 		doublearg, floatarg),
 	TP_FIELDS(
 		ctf_integer(int, intfield, anint)
 		ctf_integer_hex(int, intfield2, anint)
 		ctf_integer(long, longfield, anint)
-		ctf_integer_network(int, intfield3, anint)
-		ctf_integer_network_hex(int, intfield4, anint)
+		ctf_integer_network(int, netintfield, netint)
+		ctf_integer_network_hex(int, netintfieldhex, netint)
 		ctf_array(long, arrfield1, values, 3)
 		ctf_array_text(char, arrfield2, text, 10)
 		ctf_sequence(char, seqfield1, text,