Introduce LTTNG_UST_MAP_POPULATE_POLICY environment variable
[lttng-ust.git] / include / lttng / tracepoint.h
index 043426fce78e580806e5446e12fa4945e7b652a0..9342c5c1f5a09e1c2db375b285f4679c5e81c22a 100644 (file)
@@ -1,26 +1,33 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
+// SPDX-FileCopyrightText: 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: MIT
 
-#ifndef _LTTNG_TRACEPOINT_H
-#define _LTTNG_TRACEPOINT_H
+#ifndef _LTTNG_UST_TRACEPOINT_H
+#define _LTTNG_UST_TRACEPOINT_H
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <lttng/tracepoint-types.h>
 #include <lttng/tracepoint-rcu.h>
+#include <lttng/ust-utils.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 #include <dlfcn.h>     /* for dlopen */
 #include <string.h>    /* for memset */
+#include <stdbool.h>
 
 #include <lttng/ust-config.h>  /* for sdt */
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ust-api-compat.h>
 
+#if (defined(__cplusplus) && (__cplusplus <= 199711L))
+#error "C++11 support is required to build tracepoints and providers as C++"
+#endif
+
 #define LTTNG_UST_TRACEPOINT_NAME_LEN_MAX      256
 
 #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
@@ -182,7 +189,8 @@ extern "C" {
  * address.
  */
 #define LTTNG_UST__DECLARE_TRACEPOINT(_provider, _name, ...)                                   \
-extern struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name;               \
+extern struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name                \
+               LTTNG_UST__TRACEPOINT_DEFINITION_VISIBILITY;                            \
 static inline                                                                          \
 void lttng_ust_tracepoint_cb_##_provider##___##_name(LTTNG_UST__TP_ARGS_PROTO(__VA_ARGS__))            \
        __attribute__((always_inline, unused)) lttng_ust_notrace;                       \
@@ -191,10 +199,10 @@ void lttng_ust_tracepoint_cb_##_provider##___##_name(LTTNG_UST__TP_ARGS_PROTO(__
 {                                                                                      \
        struct lttng_ust_tracepoint_probe *__tp_probe;                                  \
                                                                                        \
-       if (caa_unlikely(!TP_RCU_LINK_TEST()))                                          \
+       if (caa_unlikely(!LTTNG_UST_TP_RCU_LINK_TEST()))                                                \
                return;                                                                 \
-       tp_rcu_read_lock();                                                             \
-       __tp_probe = tp_rcu_dereference(lttng_ust_tracepoint_##_provider##___##_name.probes);   \
+       lttng_ust_tp_rcu_read_lock();                                                           \
+       __tp_probe = lttng_ust_tp_rcu_dereference(lttng_ust_tracepoint_##_provider##___##_name.probes); \
        if (caa_unlikely(!__tp_probe))                                                  \
                goto end;                                                               \
        do {                                                                            \
@@ -205,7 +213,7 @@ void lttng_ust_tracepoint_cb_##_provider##___##_name(LTTNG_UST__TP_ARGS_PROTO(__
                                (LTTNG_UST__TP_ARGS_DATA_VAR(__VA_ARGS__));                     \
        } while ((++__tp_probe)->func);                                                 \
 end:                                                                                   \
-       tp_rcu_read_unlock();                                                           \
+       lttng_ust_tp_rcu_read_unlock();                                                         \
 }                                                                                      \
 static inline                                                                          \
 void lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \
@@ -215,7 +223,7 @@ static inline                                                                               \
 void lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \
                void (*func)(void), void *data)                                         \
 {                                                                                      \
-       lttng_ust_tracepoint_probe_register(provider_name, event_name, func, data,              \
+       lttng_ust_tracepoint_provider_register(provider_name, event_name, func, data,           \
                lttng_ust_tracepoint_##_provider##___##_name.signature);                        \
 }                                                                                      \
 static inline                                                                          \
@@ -226,14 +234,27 @@ static inline                                                                             \
 void lttng_ust_tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \
                void (*func)(void), void *data)                                         \
 {                                                                                      \
-       lttng_ust_tracepoint_probe_unregister(provider_name, event_name, func, data);           \
+       lttng_ust_tracepoint_provider_unregister(provider_name, event_name, func, data);                \
 }
 
-extern int lttng_ust_tracepoint_probe_register(const char *provider_name, const char *event_name,
+/*
+ * Registration of tracepoint provider probe functions with
+ * lttng_ust_tracepoint_provider_register, unregistration with
+ * lttng_ust_tracepoint_provider_unregister.
+ */
+int lttng_ust_tracepoint_provider_register(const char *provider_name, const char *event_name,
                void (*func)(void), void *data, const char *signature);
-extern int lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name,
+int lttng_ust_tracepoint_provider_unregister(const char *provider_name, const char *event_name,
                void (*func)(void), void *data);
 
+/*
+ * Registration of tracepoint instrumentation modules with lttng_ust_tracepoint_module_register,
+ * unregistration with lttng_ust_tracepoint_module_unregister.
+ */
+int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start,
+                             int tracepoints_count);
+int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start);
+
 /*
  * tracepoint dynamic linkage handling (callbacks). Hidden visibility:
  * shared across objects in a module/main executable.
@@ -251,9 +272,9 @@ struct lttng_ust_tracepoint_dlopen {
 
        void *liblttngust_handle;
 
-       int (*lttng_ust_tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start,
+       int (*lttng_ust_tracepoint_module_register)(struct lttng_ust_tracepoint * const *tracepoints_start,
                int tracepoints_count);
-       int (*lttng_ust_tracepoint_unregister_lib)(struct lttng_ust_tracepoint * const *tracepoints_start);
+       int (*lttng_ust_tracepoint_module_unregister)(struct lttng_ust_tracepoint * const *tracepoints_start);
        void (*rcu_read_lock_sym)(void);
        void (*rcu_read_unlock_sym)(void);
        void *(*rcu_dereference_sym)(void *p);
@@ -350,17 +371,17 @@ lttng_ust_tracepoint__init_urcu_sym(void)
                lttng_ust_tracepoint_dlopen_ptr->rcu_read_lock_sym =
                        URCU_FORCE_CAST(void (*)(void),
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-                                       "tp_rcu_read_lock"));
+                                       "lttng_ust_tp_rcu_read_lock"));
        if (!lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym)
                lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym =
                        URCU_FORCE_CAST(void (*)(void),
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-                                       "tp_rcu_read_unlock"));
+                                       "lttng_ust_tp_rcu_read_unlock"));
        if (!lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym)
                lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym =
                        URCU_FORCE_CAST(void *(*)(void *p),
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-                                       "tp_rcu_dereference_sym"));
+                                       "lttng_ust_tp_rcu_dereference_sym"));
 }
 #else
 static inline void
@@ -372,9 +393,58 @@ lttng_ust_tracepoint__init_urcu_sym(void)
 }
 #endif
 
+/*
+ * Use getenv() directly and bypass lttng-ust helper functions
+ * because we may not have access to lttng-ust shared libraries.
+ */
+#ifdef LTTNG_UST_DEBUG
+static inline
+bool lttng_ust_tracepoint_logging_debug_enabled(void)
+{
+       return true;
+}
+#else /* #ifdef LTTNG_UST_DEBUG */
+static inline
+bool lttng_ust_tracepoint_logging_debug_enabled(void)
+{
+       return getenv("LTTNG_UST_DEBUG");
+}
+#endif /* #ifdef LTTNG_UST_DEBUG */
+
+#ifdef LTTNG_UST_ABORT_ON_CRITICAL
+static inline
+bool lttng_ust_tracepoint_logging_abort_on_critical_enabled(void)
+{
+       return true;
+}
+#else /* #ifdef LTTNG_UST_ABORT_ON_CRITICAL */
+static inline
+bool lttng_ust_tracepoint_logging_abort_on_critical_enabled(void)
+{
+       return getenv("LTTNG_UST_ABORT_ON_CRITICAL");
+}
+#endif
+
+#define LTTNG_UST_TRACEPOINT_THIS_IP           \
+       ({ __label__ here; here: &&here; })
+
+static void
+lttng_ust_tracepoints_print_disabled_message(void)
+{
+       if (lttng_ust_tracepoint_logging_debug_enabled())
+               fprintf(stderr, "lttng-ust-tracepoint [%ld]: Critical: dlopen() failed to find '%s', tracepoints in this binary won't be registered. "
+                       "(at addr=%p in %s() at " __FILE__ ":" lttng_ust_stringify(__LINE__) ")\n",
+                       (long) getpid(),
+                       LTTNG_UST_TRACEPOINT_LIB_SONAME,
+                       LTTNG_UST_TRACEPOINT_THIS_IP,
+                       __func__);
+       if (lttng_ust_tracepoint_logging_abort_on_critical_enabled())
+               abort();
+}
+
 static void
 lttng_ust__tracepoints__init(void)
-       lttng_ust_notrace __attribute__((constructor));
+       lttng_ust_notrace __attribute__((constructor(LTTNG_UST_CONSTRUCTOR_PRIO)));
 static void
 lttng_ust__tracepoints__init(void)
 {
@@ -390,14 +460,16 @@ lttng_ust__tracepoints__init(void)
        if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle)
                lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle =
                        dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
-       if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle)
+       if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) {
+               lttng_ust_tracepoints_print_disabled_message();
                return;
+       }
        lttng_ust_tracepoint__init_urcu_sym();
 }
 
 static void
 lttng_ust__tracepoints__destroy(void)
-       lttng_ust_notrace __attribute__((destructor));
+       lttng_ust_notrace __attribute__((destructor(LTTNG_UST_CONSTRUCTOR_PRIO)));
 static void
 lttng_ust__tracepoints__destroy(void)
 {
@@ -439,8 +511,30 @@ lttng_ust__tracepoints__destroy(void)
 # endif
 #endif /* #if LTTNG_UST_COMPAT_API(0) */
 
+#if LTTNG_UST_COMPAT_API(0)
+#define tracepoint                     lttng_ust_tracepoint
+#define do_tracepoint                  lttng_ust_do_tracepoint
+#define tracepoint_enabled             lttng_ust_tracepoint_enabled
+#define TP_ARGS                                LTTNG_UST_TP_ARGS
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _LTTNG_UST_TRACEPOINT_H */
+
+/* The following declarations must be outside re-inclusion protection. */
+
 #ifdef LTTNG_UST_TRACEPOINT_DEFINE
 
+#ifndef _LTTNG_UST_TRACEPOINT_DEFINE_ONCE
+#define _LTTNG_UST_TRACEPOINT_DEFINE_ONCE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * These weak symbols, the constructor, and destructor take care of
  * registering only _one_ instance of the tracepoints per shared-ojbect
@@ -480,9 +574,11 @@ extern struct lttng_ust_tracepoint * const __stop_lttng_ust_tracepoints_ptrs[]
  */
 #define LTTNG_UST__TP_EXTRACT_STRING(...)      #__VA_ARGS__
 
+#undef LTTNG_UST__DEFINE_TRACEPOINT
 #define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args)                          \
        lttng_ust_tracepoint_validate_name_len(_provider, _name);               \
-       extern int lttng_ust_tracepoint_provider_##_provider;                           \
+       extern int lttng_ust_tracepoint_provider_##_provider                    \
+               LTTNG_UST__TRACEPOINT_PROVIDER_DEFINITION_VISIBILITY;           \
        static const char lttng_ust_tp_provider_strtab_##_provider##___##_name[]        \
                __attribute__((section("lttng_ust_tracepoints_strings"))) =             \
                        #_provider;                                             \
@@ -490,7 +586,8 @@ extern struct lttng_ust_tracepoint * const __stop_lttng_ust_tracepoints_ptrs[]
                __attribute__((section("lttng_ust_tracepoints_strings"))) =             \
                        #_name;                                                 \
        struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name        \
-               __attribute__((section("lttng_ust_tracepoints"))) = {                   \
+               __attribute__((section("lttng_ust_tracepoints")))               \
+               LTTNG_UST__TRACEPOINT_DEFINITION_VISIBILITY = {                 \
                        sizeof(struct lttng_ust_tracepoint),                    \
                        lttng_ust_tp_provider_strtab_##_provider##___##_name,           \
                        lttng_ust_tp_name_strtab_##_provider##___##_name,               \
@@ -507,7 +604,7 @@ extern struct lttng_ust_tracepoint * const __stop_lttng_ust_tracepoints_ptrs[]
 
 static void
 lttng_ust__tracepoints__ptrs_init(void)
-       lttng_ust_notrace __attribute__((constructor));
+       lttng_ust_notrace __attribute__((constructor(LTTNG_UST_CONSTRUCTOR_PRIO)));
 static void
 lttng_ust__tracepoints__ptrs_init(void)
 {
@@ -518,18 +615,20 @@ lttng_ust__tracepoints__ptrs_init(void)
        if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle)
                lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle =
                        dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL);
-       if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle)
+       if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) {
+               lttng_ust_tracepoints_print_disabled_message();
                return;
+       }
        if (!lttng_ust_tracepoint_destructors_syms_ptr)
                lttng_ust_tracepoint_destructors_syms_ptr = &lttng_ust_tracepoint_destructors_syms;
-       lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib =
+       lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register =
                URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int),
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-                                       "lttng_ust_tracepoint_register_lib"));
-       lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib =
+                                       "lttng_ust_tracepoint_module_register"));
+       lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister =
                URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *),
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
-                                       "lttng_ust_tracepoint_unregister_lib"));
+                                       "lttng_ust_tracepoint_module_unregister"));
        lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors =
                URCU_FORCE_CAST(void (*)(void),
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
@@ -539,8 +638,8 @@ lttng_ust__tracepoints__ptrs_init(void)
                                dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle,
                                        "lttng_ust_tp_get_destructors_state"));
        lttng_ust_tracepoint__init_urcu_sym();
-       if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib) {
-               lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib(__start_lttng_ust_tracepoints_ptrs,
+       if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register) {
+               lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register(__start_lttng_ust_tracepoints_ptrs,
                                __stop_lttng_ust_tracepoints_ptrs -
                                __start_lttng_ust_tracepoints_ptrs);
        }
@@ -548,7 +647,7 @@ lttng_ust__tracepoints__ptrs_init(void)
 
 static void
 lttng_ust__tracepoints__ptrs_destroy(void)
-       lttng_ust_notrace __attribute__((destructor));
+       lttng_ust_notrace __attribute__((destructor(LTTNG_UST_CONSTRUCTOR_PRIO)));
 static void
 lttng_ust__tracepoints__ptrs_destroy(void)
 {
@@ -560,8 +659,8 @@ lttng_ust__tracepoints__ptrs_destroy(void)
                lttng_ust_tracepoint_dlopen_ptr = &lttng_ust_tracepoint_dlopen;
        if (!lttng_ust_tracepoint_destructors_syms_ptr)
                lttng_ust_tracepoint_destructors_syms_ptr = &lttng_ust_tracepoint_destructors_syms;
-       if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib)
-               lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib(__start_lttng_ust_tracepoints_ptrs);
+       if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister)
+               lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister(__start_lttng_ust_tracepoints_ptrs);
        if (lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle
                        && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state
                        && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state()
@@ -575,29 +674,53 @@ lttng_ust__tracepoints__ptrs_destroy(void)
        }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _LTTNG_UST_TRACEPOINT_DEFINE_ONCE */
+
 #else /* LTTNG_UST_TRACEPOINT_DEFINE */
 
+#undef LTTNG_UST__DEFINE_TRACEPOINT
 #define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args)
 
 #endif /* #else LTTNG_UST_TRACEPOINT_DEFINE */
 
-#if LTTNG_UST_COMPAT_API(0)
-#define tracepoint                     lttng_ust_tracepoint
-#define do_tracepoint                  lttng_ust_do_tracepoint
-#define tracepoint_enabled             lttng_ust_tracepoint_enabled
-#define TP_ARGS                                LTTNG_UST_TP_ARGS
-#define TP_FIELDS                      LTTNG_UST_TP_FIELDS
-#endif /* #if LTTNG_UST_COMPAT_API(0) */
+/*
+ * LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION: Define this before including
+ * a tracepoint instrumentation header to hide symbols associated with
+ * tracepoint module instrumentation. This is useful if all compile
+ * units using the lttng_ust_tracepoint(),
+ * lttng_ust_tracepoint_enabled() and lttng_ust_do_tracepoint() macros
+ * is within the same module as the compile unit including the
+ * tracepoint header after defining LTTNG_UST_TRACEPOINT_DEFINE.
+ */
 
-#ifdef __cplusplus
-}
+#undef LTTNG_UST__TRACEPOINT_DEFINITION_VISIBILITY
+#ifdef LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST__TRACEPOINT_DEFINITION_VISIBILITY            __attribute__((visibility("hidden")))
+#else
+#define LTTNG_UST__TRACEPOINT_DEFINITION_VISIBILITY            __attribute__((visibility("default")))
 #endif
 
-#endif /* _LTTNG_TRACEPOINT_H */
-
-/* The following declarations must be outside re-inclusion protection. */
+/*
+ * LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION: Define this before
+ * including a tracepoint instrumentation header to hide symbols
+ * associated with the tracepoint provider. This is useful if the
+ * tracepoint definition (including the header after defining
+ * LTTNG_UST_TRACEPOINT_DEFINE) is in the same module as the provider
+ * (including the header after defining
+ * LTTNG_UST_TRACEPOINT_CREATE_PROBES).
+ */
+#undef LTTNG_UST__TRACEPOINT_PROVIDER_DEFINITION_VISIBILITY
+#ifdef LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION
+#define LTTNG_UST__TRACEPOINT_PROVIDER_DEFINITION_VISIBILITY   __attribute__((visibility("hidden")))
+#else
+#define LTTNG_UST__TRACEPOINT_PROVIDER_DEFINITION_VISIBILITY   __attribute__((visibility("default")))
+#endif
 
-#ifndef TRACEPOINT_ENUM
+#ifndef LTTNG_UST_TRACEPOINT_ENUM
 
 /*
  * Tracepoint Enumerations
@@ -608,20 +731,20 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *
  * An example:
  *
- * TRACEPOINT_ENUM(someproject_component, enumname,
- *     TP_ENUM_VALUES(
- *             ctf_enum_value("even", 0)
- *             ctf_enum_value("uneven", 1)
- *             ctf_enum_range("twoto4", 2, 4)
- *             ctf_enum_value("five", 5)
+ * LTTNG_UST_TRACEPOINT_ENUM(someproject_component, enumname,
+ *     LTTNG_UST_TP_ENUM_VALUES(
+ *             lttng_ust_field_enum_value("even", 0)
+ *             lttng_ust_field_enum_value("uneven", 1)
+ *             lttng_ust_field_enum_range("twoto4", 2, 4)
+ *             lttng_ust_field_enum_value("five", 5)
  *     )
  * )
  *
  * Where "someproject_component" is the name of the component this enumeration
  * belongs to and "enumname" identifies this enumeration. Inside the
- * TP_ENUM_VALUES macro is the actual mapping. Each string value can map
- * to either a single value with ctf_enum_value or a range of values
- * with ctf_enum_range.
+ * LTTNG_UST_TP_ENUM_VALUES macro is the actual mapping. Each string value can map
+ * to either a single value with lttng_ust_field_enum_value or a range of values
+ * with lttng_ust_field_enum_range.
  *
  * Enumeration ranges may overlap, but the behavior is implementation-defined,
  * each trace reader will handle overlapping as it wishes.
@@ -629,17 +752,21 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  * That enumeration can then be used in a field inside the TP_FIELD macro using
  * the following line:
  *
- * ctf_enum(someproject_component, enumname, enumtype, enumfield, enumval)
+ * lttng_ust_field_enum(someproject_component, enumname, enumtype, enumfield, enumval)
  *
  * Where "someproject_component" and "enumname" match those in the
- * TRACEPOINT_ENUM, "enumtype" is a signed or unsigned integer type
+ * LTTNG_UST_TRACEPOINT_ENUM, "enumtype" is a signed or unsigned integer type
  * backing the enumeration, "enumfield" is the name of the field and
  * "enumval" is the value.
  */
 
-#define TRACEPOINT_ENUM(provider, name, values)
+#define LTTNG_UST_TRACEPOINT_ENUM(provider, name, values)
 
-#endif /* #ifndef TRACEPOINT_ENUM */
+#if LTTNG_UST_COMPAT_API(0)
+#define TRACEPOINT_ENUM                LTTNG_UST_TRACEPOINT_ENUM
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#endif /* #ifndef LTTNG_UST_TRACEPOINT_ENUM */
 
 #ifndef LTTNG_UST_TRACEPOINT_EVENT
 
@@ -659,24 +786,24 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *
  *     LTTNG_UST_TP_FIELDS(
  *         * Integer, printed in base 10 *
- *         ctf_integer(int, field_a, arg0)
+ *         lttng_ust_field_integer(int, field_a, arg0)
  *
  *         * Integer, printed with 0x base 16 *
- *         ctf_integer_hex(unsigned long, field_d, arg1)
+ *         lttng_ust_field_integer_hex(unsigned long, field_d, arg1)
  *
  *         * Enumeration *
- *         ctf_enum(someproject_component, enum_name, int, field_e, arg0)
+ *         lttng_ust_field_enum(someproject_component, enum_name, int, field_e, arg0)
  *
  *         * Array Sequence, printed as UTF8-encoded array of bytes *
- *         ctf_array_text(char, field_b, string, FIXED_LEN)
- *         ctf_sequence_text(char, field_c, string, size_t, strlen)
+ *         lttng_ust_field_array_text(char, field_b, string, FIXED_LEN)
+ *         lttng_ust_field_sequence_text(char, field_c, string, size_t, strlen)
  *
  *         * String, printed as UTF8-encoded string *
- *         ctf_string(field_e, string)
+ *         lttng_ust_field_string(field_e, string)
  *
  *         * Array sequence of signed integer values *
- *         ctf_array(long, field_f, arg4, FIXED_LEN4)
- *         ctf_sequence(long, field_g, arg4, size_t, arg4_len)
+ *         lttng_ust_field_array(long, field_f, arg4, FIXED_LEN4)
+ *         lttng_ust_field_sequence(long, field_g, arg4, size_t, arg4_len)
  *     )
  * )
  *
@@ -731,19 +858,22 @@ lttng_ust__tracepoints__ptrs_destroy(void)
 
 #define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
 
-#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))
 
 #if LTTNG_UST_COMPAT_API(0)
 #define TRACEPOINT_EVENT               LTTNG_UST_TRACEPOINT_EVENT
 #define TRACEPOINT_EVENT_CLASS         LTTNG_UST_TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_INSTANCE      LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, args)   \
+       LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template,       \
+               _provider, _name, LTTNG_UST__TP_PARAMS(args))
+
 #endif /* #if LTTNG_UST_COMPAT_API(0) */
 
 #endif /* #ifndef LTTNG_UST_TRACEPOINT_EVENT */
 
-#ifndef TRACEPOINT_LOGLEVEL
+#ifndef LTTNG_UST_TRACEPOINT_LOGLEVEL
 
 /*
  * Tracepoint Loglevels
@@ -757,88 +887,112 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  * semantic. Loglevels 7 through 13 offer more fine-grained selection of
  * debug information.
  *
- * TRACE_EMERG           0
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG           0
  * system is unusable
  *
- * TRACE_ALERT           1
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT           1
  * action must be taken immediately
  *
- * TRACE_CRIT            2
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT            2
  * critical conditions
  *
- * TRACE_ERR             3
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR             3
  * error conditions
  *
- * TRACE_WARNING         4
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING         4
  * warning conditions
  *
- * TRACE_NOTICE          5
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE          5
  * normal, but significant, condition
  *
- * TRACE_INFO            6
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO            6
  * informational message
  *
- * TRACE_DEBUG_SYSTEM    7
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM    7
  * debug information with system-level scope (set of programs)
  *
- * TRACE_DEBUG_PROGRAM   8
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM   8
  * debug information with program-level scope (set of processes)
  *
- * TRACE_DEBUG_PROCESS   9
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS   9
  * debug information with process-level scope (set of modules)
  *
- * TRACE_DEBUG_MODULE    10
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE    10
  * debug information with module (executable/library) scope (set of units)
  *
- * TRACE_DEBUG_UNIT      11
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT      11
  * debug information with compilation unit scope (set of functions)
  *
- * TRACE_DEBUG_FUNCTION  12
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION  12
  * debug information with function-level scope
  *
- * TRACE_DEBUG_LINE      13
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE      13
  * debug information with line-level scope (LTTNG_UST_TRACEPOINT_EVENT default)
  *
- * TRACE_DEBUG           14
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG           14
  * debug-level message
  *
  * Declare tracepoint loglevels for tracepoints. A LTTNG_UST_TRACEPOINT_EVENT
- * should be declared prior to the the TRACEPOINT_LOGLEVEL for a given
+ * should be declared prior to the the LTTNG_UST_TRACEPOINT_LOGLEVEL for a given
  * tracepoint name. The first field is the provider name, the second
  * field is the name of the tracepoint, the third field is the loglevel
  * name.
  *
- *      TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >,
+ *      LTTNG_UST_TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >,
  *              < loglevel_name >)
  *
- * The TRACEPOINT_PROVIDER must be already declared before declaring a
- * TRACEPOINT_LOGLEVEL.
+ * The LTTNG_UST_TRACEPOINT_PROVIDER must be already declared before declaring a
+ * LTTNG_UST_TRACEPOINT_LOGLEVEL.
  */
 
 enum {
-       TRACE_EMERG             = 0,
-       TRACE_ALERT             = 1,
-       TRACE_CRIT              = 2,
-       TRACE_ERR               = 3,
-       TRACE_WARNING           = 4,
-       TRACE_NOTICE            = 5,
-       TRACE_INFO              = 6,
-       TRACE_DEBUG_SYSTEM      = 7,
-       TRACE_DEBUG_PROGRAM     = 8,
-       TRACE_DEBUG_PROCESS     = 9,
-       TRACE_DEBUG_MODULE      = 10,
-       TRACE_DEBUG_UNIT        = 11,
-       TRACE_DEBUG_FUNCTION    = 12,
-       TRACE_DEBUG_LINE        = 13,
-       TRACE_DEBUG             = 14,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG             = 0,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT             = 1,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT              = 2,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR               = 3,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING           = 4,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE            = 5,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO              = 6,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM      = 7,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM     = 8,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS     = 9,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE      = 10,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT        = 11,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION    = 12,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE        = 13,
+       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG             = 14,
 };
 
-#define TRACEPOINT_LOGLEVEL(provider, name, loglevel)
+#define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel)
+
+#if LTTNG_UST_COMPAT_API(0)
+#define TRACEPOINT_LOGLEVEL    LTTNG_UST_TRACEPOINT_LOGLEVEL
+
+#define TRACE_EMERG            LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG
+#define TRACE_ALERT            LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT
+#define TRACE_CRIT             LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT
+#define TRACE_ERR              LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR
+#define TRACE_WARNING          LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING
+#define TRACE_NOTICE           LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE
+#define TRACE_INFO             LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO
+#define TRACE_DEBUG_SYSTEM     LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM
+#define TRACE_DEBUG_PROGRAM    LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM
+#define TRACE_DEBUG_PROCESS    LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS
+#define TRACE_DEBUG_MODULE     LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE
+#define TRACE_DEBUG_UNIT       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT
+#define TRACE_DEBUG_FUNCTION   LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION
+#define TRACE_DEBUG_LINE       LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE
+#define TRACE_DEBUG            LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG
+#endif
+
+#endif /* #ifndef LTTNG_UST_TRACEPOINT_LOGLEVEL */
 
-#endif /* #ifndef TRACEPOINT_LOGLEVEL */
+#ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
 
-#ifndef TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#if LTTNG_UST_COMPAT_API(0)
+#define TRACEPOINT_MODEL_EMF_URI LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#endif
 
-#endif /* #ifndef TRACEPOINT_MODEL_EMF_URI */
+#endif /* #ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI */
This page took 0.033597 seconds and 4 git commands to generate.