Move include/ust/ to include/lttng/

[lttng-ust.git] / tests / hello / ust_tests_hello.h

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index a4e32964e031a45cafcdaa3dfa3235e24423f2fe..5ad67f48076aa851233b670523de5728e11e2cca 100644 (file)
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -4,13 +4,17 @@
 #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * 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
@@ -22,22 +26,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(ust_tests_hello_tptest,
-                       TP_PROTO(int anint),
-                       TP_ARGS(anint),
-                       TP_FIELDS(
-                               ctf_integer(int, intfield, anint)
-                               ctf_integer_hex(int, intfield2, anint)
-                               ctf_integer_network(int, intfield3, anint)
-                               ctf_integer_network_hex(int, intfield4, anint)
-                       ))
+       TP_PROTO(int anint, int netint, long *values,
+                char *text, size_t textlen,
+                double doublearg, float floatarg),
+       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, 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,
+                            size_t, textlen)
+               ctf_sequence_text(char, seqfield2, text,
+                            size_t, textlen)
+               ctf_string(stringfield, text)
+               ctf_float(float, floatfield, floatarg)
+               ctf_float(double, doublefield, doublearg)
+       )
+)
 
 TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
-                       TP_FIELDS())
+       TP_FIELDS()
+)
 
-#endif /* _TRACEPOINT_TP_H */
+#endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
 #undef TRACEPOINT_INCLUDE_PATH
 #define TRACEPOINT_INCLUDE_PATH .
@@ -45,4 +64,8 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
 #define TRACEPOINT_INCLUDE_FILE ust_tests_hello
 
 /* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
+
+#ifdef __cplusplus 
+}
+#endif