summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
660323e)
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: Ib8d0af6af18882283b239593517a4c33384fcf93
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
28 files changed:
#undef TRACEPOINT_INCLUDE
#define TRACEPOINT_INCLUDE "tracepoint-provider.h"
#undef TRACEPOINT_INCLUDE
#define TRACEPOINT_INCLUDE "tracepoint-provider.h"
-#if !defined(MY_TRACEPOINT_PROVIDER_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(MY_TRACEPOINT_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define MY_TRACEPOINT_PROVIDER_H
#include <lttng/tracepoint.h>
#define MY_TRACEPOINT_PROVIDER_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_demo
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_demo
-#if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_DEMO_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_DEMO_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_demo2
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_demo2
-#if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_DEMO2_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_DEMO2_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_demo3
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_demo3
-#if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_DEMO3_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_DEMO3_H
#include <lttng/tracepoint.h>
* Add this precompiler conditionals to ensure the tracepoint event generation
* can include this file more than once.
*/
* Add this precompiler conditionals to ensure the tracepoint event generation
* can include this file more than once.
*/
-#if !defined(_SAMPLE_COMPONENT_PROVIDER_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_SAMPLE_COMPONENT_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _SAMPLE_COMPONENT_PROVIDER_H
/*
* Add this to allow programs to call "tracepoint(...):
#define _SAMPLE_COMPONENT_PROVIDER_H
/*
* Add this to allow programs to call "tracepoint(...):
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
-#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_CREATE_PROBES
#endif
#undef TRACEPOINT_CREATE_PROBES
#endif
+#define LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ
+#if LTTNG_UST_COMPAT_API(0)
#define TRACEPOINT_HEADER_MULTI_READ
#define TRACEPOINT_HEADER_MULTI_READ
#include TRACEPOINT_INCLUDE
#include <lttng/ust-tracepoint-event.h>
#include TRACEPOINT_INCLUDE
#include <lttng/ust-tracepoint-event.h>
+#undef LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ
+#if LTTNG_UST_COMPAT_API(0)
#undef TRACEPOINT_HEADER_MULTI_READ
#undef TRACEPOINT_HEADER_MULTI_READ
#undef TRACEPOINT_INCLUDE
#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#undef TRACEPOINT_INCLUDE
#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile_fast
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile_fast
-#if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_H
#ifdef __cplusplus
#define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile
-#if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_H
#ifdef __cplusplus
#define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_dl
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_dl
-#if !defined(_TRACEPOINT_UST_DL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_DL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_DL_H
#ifdef __cplusplus
#define _TRACEPOINT_UST_DL_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_jul
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_jul
-#if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_JUL_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_LTTNG_UST_JUL_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_log4j
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_log4j
-#if !defined(_TRACEPOINT_LTTNG_UST_LOG4J_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_LOG4J_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_LOG4J_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_LTTNG_UST_LOG4J_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_java
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_java
-#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_JAVA_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_LTTNG_UST_JAVA_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_libc
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_libc
-#if !defined(_TRACEPOINT_UST_LIBC_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_LIBC_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_LIBC_H
#ifdef __cplusplus
#define _TRACEPOINT_UST_LIBC_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_pthread
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_pthread
-#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_PTHREAD_H
#ifdef __cplusplus
#define _TRACEPOINT_UST_PTHREAD_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_python
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_python
-#if !defined(_TRACEPOINT_LTTNG_UST_PYTHON_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_PYTHON_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_PYTHON_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_LTTNG_UST_PYTHON_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_statedump
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_statedump
-#if !defined(_TRACEPOINT_LTTNG_UST_STATEDUMP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_STATEDUMP_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_STATEDUMP_H
#ifdef __cplusplus
#define _TRACEPOINT_LTTNG_UST_STATEDUMP_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_tracef
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_tracef
-#if !defined(_TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H
#include <lttng/tp/lttng-ust-tracef.h>
#define _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H
#include <lttng/tp/lttng-ust-tracef.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_tracelog
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_tracelog
-#if !defined(_TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H
#include <lttng/tp/lttng-ust-tracelog.h>
#define _TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H
#include <lttng/tp/lttng-ust-tracelog.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_lib
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER lttng_ust_lib
-#if !defined(_TRACEPOINT_UST_LIB_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_LIB_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_LIB_H
#ifdef __cplusplus
#define _TRACEPOINT_UST_LIB_H
#ifdef __cplusplus
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_benchmark
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_benchmark
-#if !defined(_TRACEPOINT_UST_TESTS_BENCHMARK_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_BENCHMARK_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_BENCHMARK_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_BENCHMARK_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_ctf_types
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_ctf_types
-#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_CTF_TYPES_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_CTF_TYPES_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello_many
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello_many
-#if !defined(_TRACEPOINT_UST_TESTS_HELLO_MANY_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_MANY_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_HELLO_MANY_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_HELLO_MANY_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
-#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
-#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_sameline
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_sameline
-#if !defined(_TRACEPOINT_UST_TESTS_SAMELINE_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_SAMELINE_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_SAMELINE_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_SAMELINE_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
#undef TRACEPOINT_PROVIDER
#define TRACEPOINT_PROVIDER ust_tests_hello
-#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#define _TRACEPOINT_UST_TESTS_HELLO_H
#include <lttng/tracepoint.h>
#undef TRACEPOINT_INCLUDE
#define TRACEPOINT_INCLUDE "./{headerFilename}"
#undef TRACEPOINT_INCLUDE
#define TRACEPOINT_INCLUDE "./{headerFilename}"
-#if !defined({includeGuard}) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined({includeGuard}) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
#define {includeGuard}
#include <lttng/tracepoint.h>
#define {includeGuard}
#include <lttng/tracepoint.h>