projects / lttng-ust.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Tracepoints: add provider mismatch check
[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 b9abbd31fab08fc66f8cb08df417b44e0ab78ebf..eb2e76a76224b1f732d122c2c5e7e71d9935e547 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -77,18 +77,18 @@
  */
 
 #undef TRACEPOINT_EVENT
-#define TRACEPOINT_EVENT(name, proto, args, fields)    \
-       TRACEPOINT_EVENT_CLASS(name,                    \
+#define TRACEPOINT_EVENT(provider, name, proto, args, fields)  \
+       TRACEPOINT_EVENT_CLASS(provider, name,          \
                             TP_PARAMS(proto),          \
                             TP_PARAMS(args),           \
                             TP_PARAMS(fields))         \
-       TRACEPOINT_EVENT_INSTANCE(name, name, TP_PARAMS(proto), TP_PARAMS(args))
+       TRACEPOINT_EVENT_INSTANCE(provider, name, name, TP_PARAMS(proto), TP_PARAMS(args))
 
 #undef TRACEPOINT_EVENT_NOARGS
-#define TRACEPOINT_EVENT_NOARGS(name, fields)          \
-       TRACEPOINT_EVENT_CLASS_NOARGS(name,             \
+#define TRACEPOINT_EVENT_NOARGS(provider, name, fields)        \
+       TRACEPOINT_EVENT_CLASS_NOARGS(provider, name,   \
                             TP_PARAMS(fields))         \
-       TRACEPOINT_EVENT_INSTANCE_NOARGS(name, name)
+       TRACEPOINT_EVENT_INSTANCE_NOARGS(provider, name, name)
 
 /* Helpers */
 #define _TP_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -100,6 +100,48 @@
                __max1 > __max2 ? __max1: __max2;       \
        })
 
+/*
+ * Stage 0 of the trace events.
+ *
+ * Check that each TRACEPOINT_EVENT provider argument match the
+ * TRACEPOINT_PROVIDER by creating dummy callbacks.
+ */
+
+/* Reset all macros within TRACEPOINT_EVENT */
+#include <lttng/ust-tracepoint-event-reset.h>
+
+#define TP_ID1(_token, _provider)      _token##_provider
+#define TP_ID(_token, _provider)       TP_ID1(_token, _provider)
+
+static inline
+void TP_ID(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void)
+{
+}
+
+#undef TRACEPOINT_EVENT_CLASS
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields) \
+       __tracepoint_provider_mismatch_##_provider();
+
+#undef TRACEPOINT_EVENT_CLASS_NOARGS
+#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields)        \
+       __tracepoint_provider_mismatch_##_provider();
+
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _proto, _args) \
+       __tracepoint_provider_mismatch_##_provider();
+
+#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
+#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name)   \
+       __tracepoint_provider_mismatch_##_provider();
+
+static __attribute__((unused))
+void TP_ID(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
+{
+#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE)
+}
+
+#undef TP_ID1
+#undef TP_ID
 
 /*
  * Stage 1 of the trace events.
@@ -171,14 +213,14 @@
 #define TP_FIELDS(args...) args        /* Only one used in this phase */
 
 #undef TRACEPOINT_EVENT_CLASS_NOARGS
-#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields)                       \
-       static const struct lttng_event_field __event_fields___##_name[] = { \
+#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields)                            \
+       static const struct lttng_event_field __event_fields___##_provider##___##_name[] = { \
                _fields                                                      \
        };
 
 #undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields)               \
-       TRACEPOINT_EVENT_CLASS_NOARGS(_name, TP_PARAMS(_fields))
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields)                    \
+       TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, TP_PARAMS(_fields))
 
 #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE)
 
@@ -195,12 +237,12 @@
 #define TP_PROTO(args...) args
 
 #undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields)               \
-static void __event_probe__##_name(void *__data, _proto);
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields)                    \
+static void __event_probe__##_provider##___##_name(void *__data, _proto);
 
 #undef TRACEPOINT_EVENT_CLASS_NOARGS
-#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields)                       \
-static void __event_probe__##_name(void *__data);
+#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields)                            \
+static void __event_probe__##_provider##___##_name(void *__data);
 
 #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE)
 
@@ -214,22 +256,22 @@ static void __event_probe__##_name(void *__data);
 #include <lttng/ust-tracepoint-event-reset.h>
 
 #undef TRACEPOINT_EVENT_INSTANCE_NOARGS
-#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name)                    \
+#define TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name)         \
                {                                                              \
-                       .fields = __event_fields___##_template,                \
-                       .name = #_name,                                        \
-                       .probe_callback = (void *) &__event_probe__##_template,\
-                       .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_template), \
+                       .fields = __event_fields___##_provider##___##_template,\
+                       .name = #_provider ":" #_name,                         \
+                       .probe_callback = (void *) &__event_probe__##_provider##___##_template,\
+                       .nr_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_template), \
                },
 
 #undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(_template, _name, _proto, _args)            \
-       TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name)
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _proto, _args)         \
+       TRACEPOINT_EVENT_INSTANCE_NOARGS(_provider, _template, _name)
 
-#define TP_ID1(_token, _system)        _token##_system
-#define TP_ID(_token, _system) TP_ID1(_token, _system)
+#define TP_ID1(_token, _provider)      _token##_provider
+#define TP_ID(_token, _provider)       TP_ID1(_token, _provider)
 
-static const struct lttng_event_desc TP_ID(__event_desc___, TRACEPOINT_SYSTEM)[] = {
+static const struct lttng_event_desc TP_ID(__event_desc___, TRACEPOINT_PROVIDER)[] = {
 #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE)
 };
 
@@ -243,13 +285,13 @@ static const struct lttng_event_desc TP_ID(__event_desc___, TRACEPOINT_SYSTEM)[]
  * Create a toplevel descriptor for the whole probe.
  */
 
-#define TP_ID1(_token, _system)        _token##_system
-#define TP_ID(_token, _system) TP_ID1(_token, _system)
+#define TP_ID1(_token, _provider)      _token##_provider
+#define TP_ID(_token, _provider)       TP_ID1(_token, _provider)
 
 /* non-const because list head will be modified when registered. */
-static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = {
-       .event_desc = TP_ID(__event_desc___, TRACEPOINT_SYSTEM),
-       .nr_events = _TP_ARRAY_SIZE(TP_ID(__event_desc___, TRACEPOINT_SYSTEM)),
+static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_PROVIDER) = {
+       .event_desc = TP_ID(__event_desc___, TRACEPOINT_PROVIDER),
+       .nr_events = _TP_ARRAY_SIZE(TP_ID(__event_desc___, TRACEPOINT_PROVIDER)),
 };
 
 #undef TP_ID1
@@ -300,8 +342,8 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = {
 #define TP_FIELDS(args...) args
 
 #undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields)                \
-static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields)      \
+static inline size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _proto) \
 {                                                                            \
        size_t __event_len = 0;                                               \
        unsigned int __dynamic_len_idx = 0;                                   \
@@ -351,8 +393,8 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \
 #define TP_FIELDS(args...) args
 
 #undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields)                \
-static inline size_t __event_get_align__##_name(_proto)                              \
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields)      \
+static inline size_t __event_get_align__##_provider##___##_name(_proto)              \
 {                                                                            \
        size_t __event_align = 1;                                             \
        _fields                                                               \
@@ -421,22 +463,22 @@ static inline size_t __event_get_align__##_name(_proto)                         \
 #undef TP_PROTO
 #define TP_PROTO(args...) args
 
-#undef TP_ARGS
-#define TP_ARGS(args...) args
+#undef TP_VARS
+#define TP_VARS(args...) args
 
 #undef TP_FIELDS
 #define TP_FIELDS(args...) args
 
 #undef TRACEPOINT_EVENT_CLASS
-#define TRACEPOINT_EVENT_CLASS(_name, _proto, _args, _fields)                \
-static void __event_probe__##_name(void *__data, _proto)                     \
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _proto, _args, _fields)      \
+static void __event_probe__##_provider##___##_name(void *__data, _proto)      \
 {                                                                            \
        struct ltt_event *__event = __data;                                   \
        struct ltt_channel *__chan = __event->chan;                           \
        struct lttng_ust_lib_ring_buffer_ctx __ctx;                                   \
        size_t __event_len, __event_align;                                    \
        size_t __dynamic_len_idx = 0;                                         \
-       size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_name)];       \
+       size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name)];       \
        int __ret;                                                            \
                                                                              \
        if (0)                                                                \
@@ -447,8 +489,8 @@ static void __event_probe__##_name(void *__data, _proto)                  \
                return;                                                       \
        if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled)))                 \
                return;                                                       \
-       __event_len = __event_get_size__##_name(__dynamic_len, _args);        \
-       __event_align = __event_get_align__##_name(_args);                    \
+       __event_len = __event_get_size__##_provider##___##_name(__dynamic_len, _args);        \
+       __event_align = __event_get_align__##_provider##___##_name(_args);                    \
        lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len,  \
                                 __event_align, -1, __chan->handle);          \
        __ret = __chan->ops->event_reserve(&__ctx, __event->id);              \
@@ -459,8 +501,8 @@ static void __event_probe__##_name(void *__data, _proto)                  \
 }
 
 #undef TRACEPOINT_EVENT_CLASS_NOARGS
-#define TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields)                        \
-static void __event_probe__##_name(void *__data)                             \
+#define TRACEPOINT_EVENT_CLASS_NOARGS(_provider, _name, _fields)             \
+static void __event_probe__##_provider##___##_name(void *__data)             \
 {                                                                            \
        struct ltt_event *__event = __data;                                   \
        struct ltt_channel *__chan = __event->chan;                           \
@@ -498,22 +540,22 @@ static void __event_probe__##_name(void *__data)                        \
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
-#define TP_ID1(_token, _system)        _token##_system
-#define TP_ID(_token, _system) TP_ID1(_token, _system)
+#define TP_ID1(_token, _provider)      _token##_provider
+#define TP_ID(_token, _provider)       TP_ID1(_token, _provider)
 
 static void __attribute__((constructor))
-TP_ID(__lttng_events_init__, TRACEPOINT_SYSTEM)(void)
+TP_ID(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
 {
        int ret;
 
-       ret = ltt_probe_register(&TP_ID(__probe_desc___, TRACEPOINT_SYSTEM));
+       ret = ltt_probe_register(&TP_ID(__probe_desc___, TRACEPOINT_PROVIDER));
        assert(!ret);
 }
 
 static void __attribute__((destructor))
-TP_ID(__lttng_events_exit__, TRACEPOINT_SYSTEM)(void)
+TP_ID(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
 {
-       ltt_probe_unregister(&TP_ID(__probe_desc___, TRACEPOINT_SYSTEM));
+       ltt_probe_unregister(&TP_ID(__probe_desc___, TRACEPOINT_PROVIDER));
 }
 
 #undef TP_ID1
LTTng 2.0 Userspace Tracer
This page took 0.029331 seconds and 4 git commands to generate.