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 90e58e09319674ddd62b82d1c44e4bb516b9d216..eb2e76a76224b1f732d122c2c5e7e71d9935e547 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -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.
@@ -226,10 +268,10 @@ static void __event_probe__##_provider##___##_name(void *__data);
 #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
@@ -421,8 +463,8 @@ static inline size_t __event_get_align__##_provider##___##_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
@@ -498,22 +540,22 @@ static void __event_probe__##_provider##___##_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