summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dbcc2f9)
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: Ibb5e359d4d594b8c7a51852acde8e80d9f79e131
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
28 files changed:
* Copyright (C) 2016 Sebastien Boisvert <sboisvert@gydle.com>
*/
* Copyright (C) 2016 Sebastien Boisvert <sboisvert@gydle.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "tracepoint-provider.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "tracepoint-provider.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_demo.h"
#include "ust_tests_demo.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_demo2.h"
#include "ust_tests_demo2.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_demo3.h"
#include "ust_tests_demo3.h"
* Defining macro creates the code objects of the traceprobes, only do
* it once per file
*/
* Defining macro creates the code objects of the traceprobes, only do
* it once per file
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
/*
* The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
*/
/*
* The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_hello.h"
#include "ust_tests_hello.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#ifdef TRACEPOINT_CREATE_PROBES
+#include <lttng/ust-api-compat.h>
+
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TRACEPOINT_CREATE_PROBES) && !defined(LTTNG_UST_TRACEPOINT_CREATE_PROBES)
+# define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#ifdef LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define __tp_stringify1(x) #x
#define __tp_stringify(x) __tp_stringify1(x)
#define __tp_stringify1(x) #x
#define __tp_stringify(x) __tp_stringify1(x)
LTTNG_UST__TP_PARAMS(_args))
LTTNG_UST__TP_PARAMS(_args))
+#undef LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#if LTTNG_UST_COMPAT_API(0)
#undef TRACEPOINT_CREATE_PROBES
#undef TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_HEADER_MULTI_READ
#define TRACEPOINT_HEADER_MULTI_READ
#undef TRACEPOINT_HEADER_MULTI_READ
#undef TRACEPOINT_INCLUDE
#undef TRACEPOINT_HEADER_MULTI_READ
#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
/*
* Put back definitions to the state they were when defined by
/*
* Put back definitions to the state they were when defined by
#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
#define LTTNG_UST_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 */
+#endif /* LTTNG_UST_TRACEPOINT_CREATE_PROBES */
#include <stdio.h>
#define LTTNG_UST_TRACEPOINT_DEFINE
#include <stdio.h>
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_IP_PARAM func_addr
#include "lttng-ust-cyg-profile-fast.h"
#define TP_IP_PARAM func_addr
#include "lttng-ust-cyg-profile-fast.h"
#include <stdio.h>
#define LTTNG_UST_TRACEPOINT_DEFINE
#include <stdio.h>
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_IP_PARAM func_addr
#include "lttng-ust-cyg-profile.h"
#define TP_IP_PARAM func_addr
#include "lttng-ust-cyg-profile.h"
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_IP_PARAM ip
#include "ust_dl.h"
#define TP_IP_PARAM ip
#include "ust_dl.h"
#include "org_lttng_ust_agent_jul_LttngJulApi.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "org_lttng_ust_agent_jul_LttngJulApi.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "lttng_ust_jul.h"
#include "../common/lttng_ust_context.h"
#include "lttng_ust_jul.h"
#include "../common/lttng_ust_context.h"
#include "org_lttng_ust_agent_log4j_LttngLog4jApi.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "org_lttng_ust_agent_log4j_LttngLog4jApi.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "lttng_ust_log4j.h"
#include "../common/lttng_ust_context.h"
#include "lttng_ust_log4j.h"
#include "../common/lttng_ust_context.h"
#include "org_lttng_ust_LTTngUst.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "org_lttng_ust_LTTngUst.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "lttng_ust_java.h"
JNIEXPORT void JNICALL Java_org_lttng_ust_LTTngUst_tracepointInt(JNIEnv *env,
#include "lttng_ust_java.h"
JNIEXPORT void JNICALL Java_org_lttng_ust_LTTngUst_tracepointInt(JNIEnv *env,
#include "common/align.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "common/align.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_IP_PARAM ip
#include "ust_libc.h"
#define TP_IP_PARAM ip
#include "ust_libc.h"
#include <pthread.h>
#define LTTNG_UST_TRACEPOINT_DEFINE
#include <pthread.h>
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_IP_PARAM ip
#include "ust_pthread.h"
#define TP_IP_PARAM ip
#include "ust_pthread.h"
#define _LGPL_SOURCE
#define LTTNG_UST_TRACEPOINT_DEFINE
#define _LGPL_SOURCE
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "lttng_ust_python.h"
/*
#include "lttng_ust_python.h"
/*
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "ust_lib.h" /* Only define. */
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "ust_lib.h" /* Only define. */
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_SESSION_CHECK
#include "lttng-ust-statedump-provider.h" /* Define and create probes. */
#define TP_SESSION_CHECK
#include "lttng-ust-statedump-provider.h" /* Define and create probes. */
#include <stdio.h>
#include "common/macros.h"
#include <stdio.h>
#include "common/macros.h"
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "lttng-ust-tracef-provider.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "lttng-ust-tracef-provider.h"
#include <stdio.h>
#include "common/macros.h"
#include <stdio.h>
#include "common/macros.h"
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "lttng-ust-tracelog-provider.h"
#define LTTNG_UST_TRACEPOINT_DEFINE
#include "lttng-ust-tracelog-provider.h"
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#define TP_IP_PARAM ip
#include "ust_lib.h"
#define TP_IP_PARAM ip
#include "ust_lib.h"
* Copyright (C) 2013 Zifei Tong <soariez@gmail.com>
*/
* Copyright (C) 2013 Zifei Tong <soariez@gmail.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_benchmark.h"
#include "ust_tests_benchmark.h"
* Copyright (C) 2014 Geneviève Bastien <gbastien@versatic.net>
*/
* Copyright (C) 2014 Geneviève Bastien <gbastien@versatic.net>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_ctf_types.h"
#include "ust_tests_ctf_types.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_hello_many.h"
#include "ust_tests_hello_many.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_hello.h"
#include "ust_tests_hello.h"
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_hello.h"
#include "ust_tests_hello.h"
*/
#define LTTNG_UST_TRACEPOINT_DEFINE
*/
#define LTTNG_UST_TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_sameline.h"
int main(void)
#include "ust_tests_sameline.h"
int main(void)
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "ust_tests_hello.h"
#include "ust_tests_hello.h"
class CFile:
FILE_TPL = """
class CFile:
FILE_TPL = """
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
/*
* The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
*/
/*
* The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
*/