X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=29e84cc8f8360eba701234fec62d95dc06a0779d;hb=9508e4d5ffbb4ba602d15de0fa7843a004b02f02;hp=c82dd30dfef04326376057ab8608579776814a1e;hpb=34174843695ce2380fed2bddb1c631be97420f8d;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index c82dd30..29e84cc 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -80,7 +80,7 @@ struct marker {
 #define GET_MARKER(channel, name)	(__mark_##channel##_##name)
 
 #define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m)			\
-		struct registers regs;								\
+		struct registers __marker_regs;							\
 												\
 		/* This next asm has to be a basic inline asm (no input/output/clobber), 	\
 		 * because it must not require %-sign escaping, as we most certainly		\
@@ -132,7 +132,7 @@ struct marker {
 			ARCH_COPY_ADDR("%[outptr]")						\
 		: [outptr] "=r" (m) );								\
 												\
-		save_registers(&regs)
+		save_registers(&__marker_regs)
 
 
 #define DEFINE_MARKER(channel, name, format, unique, m)				\
@@ -172,15 +172,15 @@ struct marker {
 
 #define __trace_mark_counter(generic, channel, name, unique, call_private, format, args...) \
 	do {								\
-		struct marker *m;					\
-		DEFINE_MARKER(channel, name, format, unique, m);			\
+		struct marker *__marker_counter_ptr;			\
+		DEFINE_MARKER(channel, name, format, unique, __marker_counter_ptr);	\
 		__mark_check_format(format, ## args);			\
 		if (!generic) {						\
-			if (unlikely(imv_read(m->state))) \
-				(m->call)(m, call_private, &regs, ## args);		\
+			if (unlikely(imv_read(__marker_counter_ptr->state))) \
+				(__marker_counter_ptr->call)(__marker_counter_ptr, call_private, &__marker_regs, ## args);	\
 		} else {						\
-			if (unlikely(_imv_read(m->state))) \
-				(m->call)(m, call_private, &regs, ## args);		\
+			if (unlikely(_imv_read(__marker_counter_ptr->state))) \
+				(__marker_counter_ptr->call)(__marker_counter_ptr, call_private, &__marker_regs, ## args);		\
 		}							\
 	} while (0)
 
@@ -189,7 +189,7 @@ struct marker {
 
 #define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \
 	do {								\
-		struct registers regs;								\
+		struct registers __marker_regs;				\
 		void __check_tp_type(void)				\
 		{							\
 			register_trace_##tp_name(tp_cb, call_private);		\
@@ -197,7 +197,7 @@ struct marker {
 		DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\
 		__mark_check_format(format, ## args);			\
 		(*GET_MARKER(channel, name).call)(&GET_MARKER(channel, name), \
-			call_private, &regs, ## args);				\
+			call_private, &__marker_regs, ## args);				\
 	} while (0)
 
 extern void marker_update_probe_range(struct marker * const *begin,
@@ -345,6 +345,8 @@ extern int marker_unregister_lib(struct marker * const *markers_start);
 #define MARKER_LIB							\
 	extern struct marker * const __start___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
 	extern struct marker * const __stop___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
+	static struct marker * const __mark_ptr_dummy			\
+		__attribute__((used, section("__markers_ptrs"))) = NULL;\
 									\
 	static void __attribute__((constructor)) __markers__init(void)	\
 	{								\