#ifdef LTTNG_UST_TRACEPOINT_CREATE_PROBES
-#define __tp_stringify1(x) #x
-#define __tp_stringify(x) __tp_stringify1(x)
+#define lttng_ust__tp_stringify1(x) #x
+#define lttng_ust__tp_stringify(x) lttng_ust__tp_stringify1(x)
#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
-#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_template_provider, _template_name, \
+ _provider, _name, _args)
#undef LTTNG_UST_TRACEPOINT_EVENT
#define LTTNG_UST_TRACEPOINT_EVENT(_provider, _name, _args, _fields) \
LTTNG_UST_TRACEPOINT_EVENT_CLASS(_provider, _name, LTTNG_UST__TP_PARAMS(_args), \
LTTNG_UST__TP_PARAMS(_fields)) \
- LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name, \
+ LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _name, _provider, _name, \
LTTNG_UST__TP_PARAMS(_args))
# endif
#endif /* #if LTTNG_UST_COMPAT_API(0) */
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TRACEPOINT_PROVIDER) && !defined(LTTNG_UST_TRACEPOINT_PROVIDER)
+# define LTTNG_UST_TRACEPOINT_PROVIDER TRACEPOINT_PROVIDER
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TP_SESSION_CHECK) && !defined(LTTNG_UST_TP_SESSION_CHECK)
+# define LTTNG_UST_TP_SESSION_CHECK
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TP_IP_PARAM) && !defined(LTTNG_UST_TP_IP_PARAM)
+# define LTTNG_UST_TP_IP_PARAM
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
#include LTTNG_UST_TRACEPOINT_INCLUDE
#include <lttng/ust-tracepoint-event.h>
#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
-#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args) \
+#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(template_provider, template_name, provider, name, args) \
LTTNG_UST__DECLARE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args)) \
LTTNG_UST__DEFINE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args))