projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tracepoint API namespacing 'TP_ENUM_VALUES'
[lttng-ust.git]
/
include
/
lttng
/
ust-tracepoint-event.h
diff --git
a/include/lttng/ust-tracepoint-event.h
b/include/lttng/ust-tracepoint-event.h
index 7a7c07995e06646eafaaad89ccbac78ac804bd1f..8ba095bd223afb267a9b2d65044369a383dc91bb 100644
(file)
--- a/
include/lttng/ust-tracepoint-event.h
+++ b/
include/lttng/ust-tracepoint-event.h
@@
-15,6
+15,7
@@
#include <lttng/ust-compiler.h>
#include <lttng/tracepoint.h>
#include <lttng/ust-endian.h>
#include <lttng/ust-compiler.h>
#include <lttng/tracepoint.h>
#include <lttng/ust-endian.h>
+#include <lttng/ust-api-compat.h>
#include <string.h>
#define __LTTNG_UST_NULL_STRING "(null)"
#include <string.h>
#define __LTTNG_UST_NULL_STRING "(null)"
@@
-39,18
+40,18
@@
#undef LTTNG_UST_TRACEPOINT_EVENT
#define LTTNG_UST_TRACEPOINT_EVENT(_provider, _name, _args, _fields) \
LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, \
#undef LTTNG_UST_TRACEPOINT_EVENT
#define LTTNG_UST_TRACEPOINT_EVENT(_provider, _name, _args, _fields) \
LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, \
-
_TP_PARAMS(_args),
\
-
_TP_PARAMS(_fields))
\
+
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, _name, \
- _TP_PARAMS(_args))
+
LTTNG_UST_
_TP_PARAMS(_args))
#undef LTTNG_UST_TRACEPOINT_EVENT_CLASS
#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef LTTNG_UST_TRACEPOINT_EVENT_CLASS
#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
- LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name,
_TP_PARAMS(_args),
_TP_PARAMS(_fields))
+ LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name,
LTTNG_UST__TP_PARAMS(_args), LTTNG_UST_
_TP_PARAMS(_fields))
#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
- LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _TP_PARAMS(_args))
+ LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name,
LTTNG_UST_
_TP_PARAMS(_args))
/* Helpers */
#define _TP_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
/* Helpers */
#define _TP_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@
-66,17
+67,17
@@
* Stage 0 of tracepoint event generation.
*
* Check that each LTTNG_UST_TRACEPOINT_EVENT provider argument match the
* Stage 0 of tracepoint event generation.
*
* Check that each LTTNG_UST_TRACEPOINT_EVENT provider argument match the
- * TRACEPOINT_PROVIDER by creating dummy callbacks.
+ *
LTTNG_UST_
TRACEPOINT_PROVIDER by creating dummy callbacks.
*/
/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
static inline
*/
/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
static inline
-void
_TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_,
TRACEPOINT_PROVIDER)(void)
+void
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
lttng_ust_notrace;
static inline
lttng_ust_notrace;
static inline
-void
_TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_,
TRACEPOINT_PROVIDER)(void)
+void
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
{
}
{
}
@@
-89,12
+90,12
@@
void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, TRACEPOINT_PROV
lttng_ust_tracepoint_provider_mismatch_##_provider();
static inline
lttng_ust_tracepoint_provider_mismatch_##_provider();
static inline
-void
_TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_,
TRACEPOINT_PROVIDER)(void)
+void
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
lttng_ust_notrace;
static inline
lttng_ust_notrace;
static inline
-void
_TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_,
TRACEPOINT_PROVIDER)(void)
+void
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
{
{
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
}
/*
}
/*
@@
-111,7
+112,7
@@
void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDE
#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
lttng_ust_tracepoint_validate_name_len(_provider, _name);
#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
lttng_ust_tracepoint_validate_name_len(_provider, _name);
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 0.2 of tracepoint event generation.
/*
* Stage 0.2 of tracepoint event generation.
@@
-129,13
+130,13
@@
void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDE
#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
-void __event_template_proto___##_provider##___##_template(_TP_ARGS_DATA_PROTO(_args));
+void __event_template_proto___##_provider##___##_template(
LTTNG_UST_
_TP_ARGS_DATA_PROTO(_args));
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
-void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
+void __event_template_proto___##_provider##___##_name(
LTTNG_UST_
_TP_ARGS_DATA_PROTO(_args));
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 0.9 of tracepoint event generation
/*
* Stage 0.9 of tracepoint event generation
@@
-197,17
+198,22
@@
void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
.options = LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO, \
}),
.options = LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO, \
}),
-#undef TP_ENUM_VALUES
-#define
TP_ENUM_VALUES(...)
\
+#undef
LTTNG_UST_
TP_ENUM_VALUES
+#define
LTTNG_UST_TP_ENUM_VALUES(...)
\
__VA_ARGS__
__VA_ARGS__
-#undef TRACEPOINT_ENUM
-#define TRACEPOINT_ENUM(_provider, _name, _values) \
+#if LTTNG_UST_COMPAT_API(0)
+# undef TP_ENUM_VALUES
+# define TP_ENUM_VALUES LTTNG_UST_TP_ENUM_VALUES
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#undef LTTNG_UST_TRACEPOINT_ENUM
+#define LTTNG_UST_TRACEPOINT_ENUM(_provider, _name, _values) \
const struct lttng_ust_enum_entry * const __enum_values__##_provider##_##_name[] = { \
_values \
ctf_enum_value("", 0) /* Dummy, 0-len array forbidden by C99. */ \
};
const struct lttng_ust_enum_entry * const __enum_values__##_provider##_##_name[] = { \
_values \
ctf_enum_value("", 0) /* Dummy, 0-len array forbidden by C99. */ \
};
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 0.9.1
/*
* Stage 0.9.1
@@
-238,7
+244,7
@@
void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
_fields
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
_fields
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 1 of tracepoint event generation.
/*
* Stage 1 of tracepoint event generation.
@@
-367,8
+373,8
@@
void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
ctf_integer(int, dummy, 0) /* Dummy, C99 forbids 0-len array. */ \
};
ctf_integer(int, dummy, 0) /* Dummy, C99 forbids 0-len array. */ \
};
-#undef TRACEPOINT_ENUM
-#define
TRACEPOINT_ENUM(_provider, _name, _values)
\
+#undef
LTTNG_UST_
TRACEPOINT_ENUM
+#define
LTTNG_UST_TRACEPOINT_ENUM(_provider, _name, _values)
\
static const struct lttng_ust_enum_desc __enum_##_provider##_##_name = { \
.struct_size = sizeof(struct lttng_ust_enum_desc), \
.name = #_provider "_" #_name, \
static const struct lttng_ust_enum_desc __enum_##_provider##_##_name = { \
.struct_size = sizeof(struct lttng_ust_enum_desc), \
.name = #_provider "_" #_name, \
@@
-376,7
+382,7
@@
void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
.nr_entries = _TP_ARRAY_SIZE(__enum_values__##_provider##_##_name) - 1, \
};
.nr_entries = _TP_ARRAY_SIZE(__enum_values__##_provider##_##_name) - 1, \
};
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 2 of tracepoint event generation.
/*
* Stage 2 of tracepoint event generation.
@@
-392,9
+398,9
@@
void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
-static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
+static void __event_probe__##_provider##___##_name(
LTTNG_UST_
_TP_ARGS_DATA_PROTO(_args));
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 3.0 of tracepoint event generation.
/*
* Stage 3.0 of tracepoint event generation.
@@
-463,12
+469,12
@@
static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static inline \
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static inline \
-size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)) \
+size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len,
LTTNG_UST_
_TP_ARGS_DATA_PROTO(_args)) \
lttng_ust_notrace; \
static inline \
size_t __event_get_size__##_provider##___##_name( \
size_t *__dynamic_len __attribute__((__unused__)), \
lttng_ust_notrace; \
static inline \
size_t __event_get_size__##_provider##___##_name( \
size_t *__dynamic_len __attribute__((__unused__)), \
-
_TP_ARGS_DATA_PROTO(_args))
\
+
LTTNG_UST__TP_ARGS_DATA_PROTO(_args))
\
{ \
size_t __event_len = 0; \
unsigned int __dynamic_len_idx __attribute__((__unused__)) = 0; \
{ \
size_t __event_len = 0; \
unsigned int __dynamic_len_idx __attribute__((__unused__)) = 0; \
@@
-480,7
+486,7
@@
size_t __event_get_size__##_provider##___##_name( \
return __event_len; \
}
return __event_len; \
}
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 3.1 of tracepoint event generation.
/*
* Stage 3.1 of tracepoint event generation.
@@
-633,7
+639,7
@@
size_t __event_get_size__##_provider##___##_name( \
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static inline \
void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_data,\
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static inline \
void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_data,\
- _TP_ARGS_DATA_PROTO(_args)) \
+
LTTNG_UST_
_TP_ARGS_DATA_PROTO(_args)) \
{ \
if (0) { \
(void) __tp_data; /* don't warn if unused */ \
{ \
if (0) { \
(void) __tp_data; /* don't warn if unused */ \
@@
-643,7
+649,7
@@
void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
_fields \
}
_fields \
}
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 4 of tracepoint event generation.
/*
* Stage 4 of tracepoint event generation.
@@
-707,17
+713,17
@@
void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static inline \
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static inline \
-size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
+size_t __event_get_align__##_provider##___##_name(
LTTNG_UST_
_TP_ARGS_PROTO(_args)) \
lttng_ust_notrace; \
static inline \
lttng_ust_notrace; \
static inline \
-size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
+size_t __event_get_align__##_provider##___##_name(
LTTNG_UST_
_TP_ARGS_PROTO(_args)) \
{ \
size_t __event_align = 1; \
_fields \
return __event_align; \
}
{ \
size_t __event_align = 1; \
_fields \
return __event_align; \
}
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
/*
@@
-833,10
+839,10
@@
size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static \
#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
static \
-void __event_probe__##_provider##___##_name(
_TP_ARGS_DATA_PROTO(_args))
\
+void __event_probe__##_provider##___##_name(
LTTNG_UST__TP_ARGS_DATA_PROTO(_args))
\
lttng_ust_notrace; \
static \
lttng_ust_notrace; \
static \
-void __event_probe__##_provider##___##_name(
_TP_ARGS_DATA_PROTO(_args))
\
+void __event_probe__##_provider##___##_name(
LTTNG_UST__TP_ARGS_DATA_PROTO(_args))
\
{ \
struct lttng_ust_event_common *__event = (struct lttng_ust_event_common *) __tp_data; \
size_t __dynamic_len_idx = 0; \
{ \
struct lttng_ust_event_common *__event = (struct lttng_ust_event_common *) __tp_data; \
size_t __dynamic_len_idx = 0; \
@@
-874,7
+880,7
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
return; \
if (caa_unlikely(CMM_ACCESS_ONCE(__event->eval_filter))) { \
__event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
return; \
if (caa_unlikely(CMM_ACCESS_ONCE(__event->eval_filter))) { \
__event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
-
_TP_ARGS_DATA_VAR(_args));
\
+
LTTNG_UST__TP_ARGS_DATA_VAR(_args));
\
__interpreter_stack_prepared = true; \
if (caa_likely(__event->run_filter(__event, \
__stackvar.__interpreter_stack_data, NULL) != LTTNG_UST_EVENT_FILTER_ACCEPT)) \
__interpreter_stack_prepared = true; \
if (caa_likely(__event->run_filter(__event, \
__stackvar.__interpreter_stack_data, NULL) != LTTNG_UST_EVENT_FILTER_ACCEPT)) \
@@
-889,8
+895,8
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
struct lttng_ust_ring_buffer_ctx __ctx; \
\
__event_len = __event_get_size__##_provider##___##_name(__stackvar.__dynamic_len, \
struct lttng_ust_ring_buffer_ctx __ctx; \
\
__event_len = __event_get_size__##_provider##___##_name(__stackvar.__dynamic_len, \
-
_TP_ARGS_DATA_VAR(_args));
\
- __event_align = __event_get_align__##_provider##___##_name(_TP_ARGS_VAR(_args)); \
+
LTTNG_UST__TP_ARGS_DATA_VAR(_args));
\
+ __event_align = __event_get_align__##_provider##___##_name(
LTTNG_UST_
_TP_ARGS_VAR(_args)); \
lttng_ust_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len, __event_align, \
_TP_IP_PARAM(TP_IP_PARAM)); \
__ret = __chan->ops->event_reserve(&__ctx); \
lttng_ust_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len, __event_align, \
_TP_IP_PARAM(TP_IP_PARAM)); \
__ret = __chan->ops->event_reserve(&__ctx); \
@@
-910,7
+916,7
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
\
if (caa_unlikely(!__interpreter_stack_prepared && __notif_ctx.eval_capture)) \
__event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
\
if (caa_unlikely(!__interpreter_stack_prepared && __notif_ctx.eval_capture)) \
__event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
-
_TP_ARGS_DATA_VAR(_args));
\
+
LTTNG_UST__TP_ARGS_DATA_VAR(_args));
\
\
__event_notifier->notification_send(__event_notifier, \
__stackvar.__interpreter_stack_data, \
\
__event_notifier->notification_send(__event_notifier, \
__stackvar.__interpreter_stack_data, \
@@
-920,7
+926,7
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
} \
}
} \
}
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
#undef __get_dynamic_len
#undef __get_dynamic_len
@@
-943,7
+949,7
@@
void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \
static const char __tp_event_signature___##_provider##___##_name[] = \
_TP_EXTRACT_STRING2(_args);
static const char __tp_event_signature___##_provider##___##_name[] = \
_TP_EXTRACT_STRING2(_args);
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
#undef _TP_EXTRACT_STRING2
#undef _TP_EXTRACT_STRING2
@@
-971,14
+977,14
@@
static const char __tp_event_signature___##_provider##___##_name[] = \
#define LTTNG_UST_TP_EXTERN_C
#endif
#define LTTNG_UST_TP_EXTERN_C
#endif
-#undef TRACEPOINT_LOGLEVEL
-#define
TRACEPOINT_LOGLEVEL(__provider, __name, __loglevel)
\
+#undef
LTTNG_UST_
TRACEPOINT_LOGLEVEL
+#define
LTTNG_UST_TRACEPOINT_LOGLEVEL(__provider, __name, __loglevel)
\
static const int _loglevel_value___##__provider##___##__name = __loglevel; \
LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name \
__attribute__((visibility("hidden"))) = \
&_loglevel_value___##__provider##___##__name;
static const int _loglevel_value___##__provider##___##__name = __loglevel; \
LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name \
__attribute__((visibility("hidden"))) = \
&_loglevel_value___##__provider##___##__name;
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
#undef LTTNG_UST_TP_EXTERN_C
#undef LTTNG_UST_TP_EXTERN_C
@@
-1003,12
+1009,12
@@
LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name \
#define LTTNG_UST_TP_EXTERN_C
#endif
#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; \
LTTNG_UST_TP_EXTERN_C const char * const _model_emf_uri___##__provider##___##__name \
__attribute__((visibility("hidden"))) = __uri; \
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
#undef LTTNG_UST_TP_EXTERN_C
#undef LTTNG_UST_TP_EXTERN_C
@@
-1022,7
+1028,7
@@
LTTNG_UST_TP_EXTERN_C const char * const _model_emf_uri___##__provider##___##__n
* symbol table.
*/
* symbol table.
*/
-extern const struct lttng_ust_probe_desc
_TP_COMBINE_TOKENS(__probe_desc___,
TRACEPOINT_PROVIDER)
+extern const struct lttng_ust_probe_desc
LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_
TRACEPOINT_PROVIDER)
__attribute__((visibility("hidden")));
/*
__attribute__((visibility("hidden")));
/*
@@
-1062,7
+1068,7
@@
static const struct lttng_ust_event_desc __event_desc___##_provider##_##_name =
.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name, \
};
.model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name, \
};
-#include TRACEPOINT_INCLUDE
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
/*
* Stage 7.2 of tracepoint event generation.
/*
* Stage 7.2 of tracepoint event generation.
@@
-1077,8
+1083,8
@@
static const struct lttng_ust_event_desc __event_desc___##_provider##_##_name =
#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
&__event_desc___##_provider##_##_name,
#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
&__event_desc___##_provider##_##_name,
-static const struct lttng_ust_event_desc * const
_TP_COMBINE_TOKENS(__event_desc___,
TRACEPOINT_PROVIDER)[] = {
-#include TRACEPOINT_INCLUDE
+static const struct lttng_ust_event_desc * const
LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, LTTNG_UST_
TRACEPOINT_PROVIDER)[] = {
+#include
LTTNG_UST_
TRACEPOINT_INCLUDE
NULL, /* Dummy, C99 forbids 0-len array. */
};
NULL, /* Dummy, C99 forbids 0-len array. */
};
@@
-1089,17
+1095,17
@@
static const struct lttng_ust_event_desc * const _TP_COMBINE_TOKENS(__event_desc
* Create a toplevel descriptor for the whole probe.
*/
* Create a toplevel descriptor for the whole probe.
*/
-const struct lttng_ust_probe_desc
_TP_COMBINE_TOKENS(__probe_desc___,
TRACEPOINT_PROVIDER) = {
+const struct lttng_ust_probe_desc
LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_
TRACEPOINT_PROVIDER) = {
.struct_size = sizeof(struct lttng_ust_probe_desc),
.struct_size = sizeof(struct lttng_ust_probe_desc),
- .provider_name = __tp_stringify(TRACEPOINT_PROVIDER),
- .event_desc =
_TP_COMBINE_TOKENS(__event_desc___,
TRACEPOINT_PROVIDER),
- .nr_events = _TP_ARRAY_SIZE(
_TP_COMBINE_TOKENS(__event_desc___,
TRACEPOINT_PROVIDER)) - 1,
+ .provider_name = __tp_stringify(
LTTNG_UST_
TRACEPOINT_PROVIDER),
+ .event_desc =
LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, LTTNG_UST_
TRACEPOINT_PROVIDER),
+ .nr_events = _TP_ARRAY_SIZE(
LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, LTTNG_UST_
TRACEPOINT_PROVIDER)) - 1,
.major = LTTNG_UST_PROVIDER_MAJOR,
.minor = LTTNG_UST_PROVIDER_MINOR,
};
.major = LTTNG_UST_PROVIDER_MAJOR,
.minor = LTTNG_UST_PROVIDER_MINOR,
};
-static int
_TP_COMBINE_TOKENS(__probe_register_refcount___,
TRACEPOINT_PROVIDER);
-static struct lttng_ust_registered_probe *
_TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___,
TRACEPOINT_PROVIDER);
+static int
LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___, LTTNG_UST_
TRACEPOINT_PROVIDER);
+static struct lttng_ust_registered_probe *
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_
TRACEPOINT_PROVIDER);
/*
* Stage 9 of tracepoint event generation.
/*
* Stage 9 of tracepoint event generation.
@@
-1115,48
+1121,48
@@
static struct lttng_ust_registered_probe *_TP_COMBINE_TOKENS(__lttng_ust_probe_r
/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
static void
/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
#include <lttng/ust-tracepoint-event-reset.h>
static void
-
_TP_COMBINE_TOKENS(__lttng_ust_events_init__,
TRACEPOINT_PROVIDER)(void)
+
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
lttng_ust_notrace __attribute__((constructor));
static void
lttng_ust_notrace __attribute__((constructor));
static void
-
_TP_COMBINE_TOKENS(__lttng_ust_events_init__,
TRACEPOINT_PROVIDER)(void)
+
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
{
struct lttng_ust_registered_probe *reg_probe;
{
struct lttng_ust_registered_probe *reg_probe;
- if (_TP_COMBINE_TOKENS(__probe_register_refcount___,
- TRACEPOINT_PROVIDER)++) {
+ if (
LTTNG_UST_
_TP_COMBINE_TOKENS(__probe_register_refcount___,
+
LTTNG_UST_
TRACEPOINT_PROVIDER)++) {
return;
}
/*
return;
}
/*
- * lttng_ust_tracepoint_provider_check_ ## TRACEPOINT_PROVIDER() is a
+ * lttng_ust_tracepoint_provider_check_ ##
LTTNG_UST_
TRACEPOINT_PROVIDER() is a
* static inline function that ensures every probe PROVIDER
* argument match the provider within which they appear. It
* calls empty static inline functions, and therefore has no
* runtime effect. However, if it detects an error, a linker
* error will appear.
*/
* static inline function that ensures every probe PROVIDER
* argument match the provider within which they appear. It
* calls empty static inline functions, and therefore has no
* runtime effect. However, if it detects an error, a linker
* error will appear.
*/
-
_TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_,
TRACEPOINT_PROVIDER)();
- assert(!
_TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___,
TRACEPOINT_PROVIDER));
- reg_probe = lttng_ust_probe_register(&
_TP_COMBINE_TOKENS(__probe_desc___,
TRACEPOINT_PROVIDER));
+
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_
TRACEPOINT_PROVIDER)();
+ assert(!
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_
TRACEPOINT_PROVIDER));
+ reg_probe = lttng_ust_probe_register(&
LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_
TRACEPOINT_PROVIDER));
if (!reg_probe) {
fprintf(stderr, "LTTng-UST: Error while registering tracepoint probe.\n");
abort();
}
if (!reg_probe) {
fprintf(stderr, "LTTng-UST: Error while registering tracepoint probe.\n");
abort();
}
-
_TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___,
TRACEPOINT_PROVIDER) = reg_probe;
+
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_
TRACEPOINT_PROVIDER) = reg_probe;
}
static void
}
static void
-
_TP_COMBINE_TOKENS(__lttng_ust_events_exit__,
TRACEPOINT_PROVIDER)(void)
+
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
lttng_ust_notrace __attribute__((destructor));
static void
lttng_ust_notrace __attribute__((destructor));
static void
-
_TP_COMBINE_TOKENS(__lttng_ust_events_exit__,
TRACEPOINT_PROVIDER)(void)
+
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, LTTNG_UST_
TRACEPOINT_PROVIDER)(void)
{
{
- if (--_TP_COMBINE_TOKENS(__probe_register_refcount___,
- TRACEPOINT_PROVIDER)) {
+ if (--
LTTNG_UST_
_TP_COMBINE_TOKENS(__probe_register_refcount___,
+
LTTNG_UST_
TRACEPOINT_PROVIDER)) {
return;
}
return;
}
- lttng_ust_probe_unregister(
_TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___,
TRACEPOINT_PROVIDER));
-
_TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___,
TRACEPOINT_PROVIDER) = NULL;
+ lttng_ust_probe_unregister(
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_
TRACEPOINT_PROVIDER));
+
LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_
TRACEPOINT_PROVIDER) = NULL;
}
}
-int
_TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_,
TRACEPOINT_PROVIDER)
+int
LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_, LTTNG_UST_
TRACEPOINT_PROVIDER)
__attribute__((visibility("default")));
__attribute__((visibility("default")));
This page took
0.031731 seconds
and
4
git commands to generate.