X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fdemo%2Fust_tests_demo.h;h=8758838ddba1d2859befcbc8a752ba978fd8c3f8;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=b27d5399a684b9e48780b5743b51d4529b33233e;hpb=60302adc32827b3b62028018588f0d7bebb6c5d2;p=lttng-ust.git

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index b27d5399..8758838d 100644
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -1,71 +1,47 @@
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_demo
-
-#if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_TESTS_DEMO_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_demo
+
+#if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_UST_TESTS_DEMO_H
+
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_demo, starting,
-	TP_ARGS(int, value),
-	TP_FIELDS(
-		ctf_integer(int, value, value)
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo, starting,
+	LTTNG_UST_TP_ARGS(int, value),
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(int, value, value)
 	)
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, TRACE_CRIT)
+LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT)
 
 /*
  * Dummy model information, just for example. TODO: we should check if
  * EMF model URI have some standard format we should follow.
  */
-TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, starting,
+LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, starting,
 	"http://example.com/path_to_model?q=ust_tests_demo:starting")
 
-TRACEPOINT_EVENT(ust_tests_demo, done,
-	TP_ARGS(int, value),
-	TP_FIELDS(
-		ctf_integer(int, value, value)
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo, done,
+	LTTNG_UST_TP_ARGS(int, value),
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(int, value, value)
 	)
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo, done, TRACE_CRIT)
+LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_demo, done, LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT)
 
-TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, done,
+LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, done,
 	"http://example.com/path_to_model?q=ust_tests_demo:done")
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_demo.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_demo.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif