X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fhello-static-lib%2Fust_tests_hello.h;h=80b9d3b873450511879cfcfb7ee6d893348caad8;hb=10937ee5c85456292ce4e8d67c9ac7bc37caf974;hp=35ea5f5df863d49d32b3eb3e8bf87ec263db872e;hpb=a106a9f8513054954003122126a8b33b56de4bd8;p=lttng-ust.git

diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h
index 35ea5f5d..80b9d3b8 100644
--- a/doc/examples/hello-static-lib/ust_tests_hello.h
+++ b/doc/examples/hello-static-lib/ust_tests_hello.h
@@ -1,72 +1,49 @@
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_hello
-
-#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>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello
+
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_UST_TESTS_HELLO_H
+
 #include <lttng/tracepoint.h>
+#include <stddef.h>
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest,
-	TP_ARGS(int, anint, int, netint, long *, values,
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
+	LTTNG_UST_TP_ARGS(int, anint, int, netint, long *, values,
 		 char *, text, size_t, textlen,
 		 double, doublearg, float, 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)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(int, intfield, anint)
+		lttng_ust_field_integer_hex(int, intfield2, anint)
+		lttng_ust_field_integer(long, longfield, anint)
+		lttng_ust_field_integer_network(int, netintfield, netint)
+		lttng_ust_field_integer_network_hex(int, netintfieldhex, netint)
+		lttng_ust_field_array(long, arrfield1, values, 3)
+		lttng_ust_field_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)
+		lttng_ust_field_float(float, floatfield, floatarg)
+		lttng_ust_field_float(double, doublefield, doublearg)
 	)
 )
 
-TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
-	TP_ARGS(),
-	TP_FIELDS()
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+	LTTNG_UST_TP_ARGS(),
+	LTTNG_UST_TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif