Tracepoint API namespacing 'TRACEPOINT_MODEL_EMF_URI'

The ABI bump gives us the opportunity to namespace all public symbols
under the 'lttng_ust_' prefix. Namespace all API symbols and macros
under 'lttng_ust_' / 'LTTNG_UST_' and add compat macros to keep
compatibility with the previous API.

Change-Id: Ib0aa6d868dde81bd7deb79d3a41d826bf6ed6419
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index b9384f48cc126af677971c8abda894de0853273a..e392228d2ad96eb140fbee50e849fa986d47980b 100644 (file)
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -24,7 +24,7 @@ LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, LTTNG_UST_TRACEPOINT_LOG
  * 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")
 
 LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo, done,
@@ -35,7 +35,7 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_demo, done,
 )
 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 */

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 829e962d56a8b80f2bd802124bbfb7a5b627cf4b..f97b67d1eb9dfbbea6f67c33c3e14f766227f372 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -56,7 +56,7 @@
 #undef LTTNG_UST_TRACEPOINT_LOGLEVEL
 #define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel)
 
-#undef TRACEPOINT_MODEL_EMF_URI
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
 #endif /* TRACEPOINT_CREATE_PROBES */

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 8fa73ce7a55a34f5dcbd0b2179a91b8847cda934..5d30703e3039603f272361122ce98b19962b9f66 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -861,8 +861,12 @@ enum {
 
 #endif /* #ifndef LTTNG_UST_TRACEPOINT_LOGLEVEL */
 
-#ifndef TRACEPOINT_MODEL_EMF_URI
+#ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
 
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
-#endif /* #ifndef TRACEPOINT_MODEL_EMF_URI */
+#if LTTNG_UST_COMPAT_API(0)
+#define TRACEPOINT_MODEL_EMF_URI LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#endif
+
+#endif /* #ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI */

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 5acf5a1bd7babc2d5632e303a3c95e5ce2b5d9ce..f70b9df8a82631f75e735e0608c4f4d149786005 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -24,8 +24,8 @@
 #undef LTTNG_UST_TRACEPOINT_LOGLEVEL
 #define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel)
 
-#undef TRACEPOINT_MODEL_EMF_URI
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
 #undef _ctf_integer_ext
 #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, \

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 569431f1cd71847c4776ea71f46f758ad563be9c..acd315c7dcbedd08ef5b99cf4619e1ced452741c 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -1003,8 +1003,8 @@ LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name     \
 #define LTTNG_UST_TP_EXTERN_C
 #endif
 
-#undef TRACEPOINT_MODEL_EMF_URI
-#define TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri)               \
+#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri)             \
 LTTNG_UST_TP_EXTERN_C const char * const _model_emf_uri___##__provider##___##__name   \
                __attribute__((visibility("hidden"))) = __uri;             \