X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event.h;h=7890c247453e93c0c4b0ee9038ce6531b1a49757;hb=dc2998379928860b82c233bdd66bab5b9dac0308;hp=d9801a8f6416e4f031755d2f8aa348ee3b318a4e;hpb=1c80c9098052ff7a07bb43df084c0f9d2b2e278c;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index d9801a8f..7890c247 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -120,6 +120,30 @@ static const char							\
 
 #include TRACEPOINT_INCLUDE
 
+/*
+ * Stage 0.2 of tracepoint event generation.
+ *
+ * Create dummy trace prototypes for each event class, and for each used
+ * template. This will allow checking whether the prototypes from the
+ * class and the instance using the class actually match.
+ */
+
+/* Reset all macros within TRACEPOINT_EVENT */
+#include <lttng/ust-tracepoint-event-reset.h>
+
+#undef TP_ARGS
+#define TP_ARGS(...)	__VA_ARGS__
+
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
+void __event_template_proto___##_provider##___##_template(_TP_ARGS_DATA_PROTO(_args));
+
+#undef TRACEPOINT_EVENT_CLASS
+#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
+void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
+
+#include TRACEPOINT_INCLUDE
+
 /*
  * Stage 0.9 of tracepoint event generation
  *
@@ -132,14 +156,14 @@ static const char							\
 #define ctf_enum_value(_string, _value)					\
 	{								\
 		.start = {						\
-			.signedness = lttng_is_signed_type(__typeof__(_value)), \
 			.value = lttng_is_signed_type(__typeof__(_value)) ? \
 				(long long) (_value) : (_value),	\
+			.signedness = lttng_is_signed_type(__typeof__(_value)), \
 		},							\
 		.end = {						\
-			.signedness = lttng_is_signed_type(__typeof__(_value)), \
 			.value = lttng_is_signed_type(__typeof__(_value)) ? \
 				(long long) (_value) : (_value),	\
+			.signedness = lttng_is_signed_type(__typeof__(_value)), \
 		},							\
 		.string = (_string),					\
 	},
@@ -149,18 +173,38 @@ static const char							\
 #define ctf_enum_range(_string, _range_start, _range_end)		\
 	{								\
 		.start = {						\
-			.signedness = lttng_is_signed_type(__typeof__(_range_start)), \
 			.value = lttng_is_signed_type(__typeof__(_range_start)) ? \
 				(long long) (_range_start) : (_range_start), \
+			.signedness = lttng_is_signed_type(__typeof__(_range_start)), \
 		},							\
 		.end = {						\
-			.signedness = lttng_is_signed_type(__typeof__(_range_end)), \
 			.value = lttng_is_signed_type(__typeof__(_range_end)) ? \
 				(long long) (_range_end) : (_range_end), \
+			.signedness = lttng_is_signed_type(__typeof__(_range_end)), \
 		},							\
 		.string = (_string),					\
 	},
 
+/* Enumeration entry (automatic value; follows the rules of CTF) */
+#undef ctf_enum_auto
+#define ctf_enum_auto(_string)					\
+	{								\
+		.start = {						\
+			.value = -1ULL, 				\
+			.signedness = 0, 				\
+		},							\
+		.end = {						\
+			.value = -1ULL,					\
+			.signedness = 0, 				\
+		},							\
+		.string = (_string),					\
+		.u = {							\
+			.extra = {					\
+				.options = LTTNG_ENUM_ENTRY_OPTION_IS_AUTO, \
+			},						\
+		},							\
+	},
+
 #undef TP_ENUM_VALUES
 #define TP_ENUM_VALUES(...)						\
 	__VA_ARGS__
@@ -824,14 +868,29 @@ static const char __tp_event_signature___##_provider##___##_name[] = 	\
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
+/*
+ * Declare _loglevel___##__provider##___##__name as non-static, with
+ * hidden visibility for c++ handling of weakref. We do a weakref to the
+ * symbol in a later stage, which requires that the symbol is not
+ * mangled.
+ */
+#ifdef __cplusplus
+#define LTTNG_TP_EXTERN_C extern "C"
+#else
+#define LTTNG_TP_EXTERN_C
+#endif
+
 #undef TRACEPOINT_LOGLEVEL
 #define TRACEPOINT_LOGLEVEL(__provider, __name, __loglevel)		   \
 static const int _loglevel_value___##__provider##___##__name = __loglevel; \
-static const int *_loglevel___##__provider##___##__name =		   \
+LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name	   \
+		__attribute__((visibility("hidden"))) =			   \
 		&_loglevel_value___##__provider##___##__name;
 
 #include TRACEPOINT_INCLUDE
 
+#undef LTTNG_TP_EXTERN_C
+
 /*
  * Stage 6.1 of tracepoint event generation.
  *
@@ -841,12 +900,27 @@ static const int *_loglevel___##__provider##___##__name =		   \
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
 
+/*
+ * Declare _model_emf_uri___##__provider##___##__name as non-static,
+ * with hidden visibility for c++ handling of weakref. We do a weakref
+ * to the symbol in a later stage, which requires that the symbol is not
+ * mangled.
+ */
+#ifdef __cplusplus
+#define LTTNG_TP_EXTERN_C extern "C"
+#else
+#define LTTNG_TP_EXTERN_C
+#endif
+
 #undef TRACEPOINT_MODEL_EMF_URI
 #define TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri)		   \
-static const char *_model_emf_uri___##__provider##___##__name = __uri;
+LTTNG_TP_EXTERN_C const char *_model_emf_uri___##__provider##___##__name   \
+		__attribute__((visibility("hidden"))) = __uri;		   \
 
 #include TRACEPOINT_INCLUDE
 
+#undef LTTNG_TP_EXTERN_C
+
 /*
  * Stage 7.1 of tracepoint event generation.
  *
@@ -957,7 +1031,7 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
 	_TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)();
 	ret = lttng_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
 	if (ret) {
-		fprintf(stderr, "LTTng-UST: Error (%d) while registering tracepoint probe. Duplicate registration of tracepoint probes having the same name is not allowed.\n", ret);
+		fprintf(stderr, "LTTng-UST: Error (%d) while registering tracepoint probe.\n", ret);
 		abort();
 	}
 }