X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=da738d1f3254f67b566df5c54d1800ef161216f1;hb=37ee34e4d9b9363c758aa43255d71661900e89b0;hp=8e20dad31fbdc97ca0a5b971e5465ad7dd581f26;hpb=900e307ed99ca9cb4bfe574ee4f4e1bd9c1baccc;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 8e20dad..da738d1 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -77,10 +77,10 @@ struct marker {
 	void *location;		/* Address of marker in code */
 };
 
-#define GET_MARKER(channel, name)	(__mark_##channel##_##name)
+#define GET_MARKER(name)		(__mark_ust_##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		\
@@ -94,7 +94,7 @@ struct marker {
 			 */									\
 			".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t"	\
 			/*".section __markers_strings\n\t"*/					\
-			".section __markers_strings,\"aw\",@progbits\n\t"				\
+			".section __markers_strings,\"aw\"\n\t"					\
 			"__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ":\n\t"	\
 			".string \"" __stringify(channel) "\"\n\t"					\
 			"__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ":\n\t"	\
@@ -106,15 +106,15 @@ struct marker {
 		);										\
 		asm volatile (									\
 			/*".section __markers\n\t"*/ \
-			".section __markers,\"aw\",@progbits\n\t"					\
+			".section __markers,\"aw\"\n\t"						\
 			"2:\n\t" \
 			_ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ")\n\t" /* channel string */ \
 			_ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ")\n\t" /* name string */ \
 			_ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ")\n\t" /* format string */ \
 			".byte 0\n\t" /* state imv */						\
 			".byte 0\n\t" /* ptype */							\
-			".word 0\n\t" /* channel_id */						\
-			".word 0\n\t" /* event_id */						\
+			".hword 0\n\t" /* channel_id */						\
+			".hword 0\n\t" /* event_id */						\
 			".balign " __stringify(__WORDSIZE) " / 8\n\t" /* alignment */			\
 			_ASM_PTR "(marker_probe_cb)\n\t" /* call */				\
 			_ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
@@ -125,28 +125,27 @@ struct marker {
 			_ASM_PTR "(1f)\n\t" /* location */						\
 			".previous\n\t"								\
 			/*".section __markers_ptrs\n\t"*/ \
-			".section __markers_ptrs,\"a\",@progbits\n\t"				\
-			".balign 8\n\t"								\
+			".section __markers_ptrs,\"a\"\n\t"					\
 			_ASM_PTR "(2b)\n\t"							\
 			".previous\n\t"								\
 			"1:\n\t"								\
 			ARCH_COPY_ADDR("%[outptr]")						\
 		: [outptr] "=r" (m) );								\
 												\
-		save_registers(&regs)
+		save_registers(&__marker_regs)
 
 
-#define DEFINE_MARKER(channel, name, format, unique, m)				\
-		_DEFINE_MARKER(channel, name, NULL, NULL, format, unique, m)
+#define DEFINE_MARKER(name, format, unique, m)					\
+		_DEFINE_MARKER(ust, name, NULL, NULL, format, unique, m)
 
-#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format)		\
-		_DEFINE_MARKER_TP(channel, name, #tp_name, tp_cb, format)
+#define DEFINE_MARKER_TP(name, tp_name, tp_cb, format)				\
+		_DEFINE_MARKER_TP(ust, name, #tp_name, tp_cb, format)
 
 #define _DEFINE_MARKER_TP(channel, name, tp_name_str, tp_cb, format) \
 		static const char __mstrtab_##channel##_##name[]	\
 		__attribute__((section("__markers_strings")))		\
 		= #channel "\0" #name "\0" format;			\
-		static struct marker GET_MARKER(channel, name)		\
+		static struct marker __mark_##channel##_##name		\
 		__attribute__((section("__markers"))) =			\
 		{ __mstrtab_##channel##_##name,				\
 			&__mstrtab_##channel##_##name[sizeof(#channel)],	\
@@ -156,7 +155,7 @@ struct marker {
 			NULL, tp_name_str, tp_cb };			\
 		static struct marker * const __mark_ptr_##channel##_##name	\
 			__attribute__((used, section("__markers_ptrs"))) =	\
-			&GET_MARKER(channel, name);
+			&__mark_##channel##_##name;
 
 /*
  * Make sure the alignment of the structure in the __markers section will
@@ -173,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, NULL, NULL, 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)
 
@@ -190,15 +189,15 @@ 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);		\
 		}							\
-		DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\
+		_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);				\
+		(*__mark_##channel##_##name.call)(&__mark_##channel##_##name,	\
+			call_private, &__marker_regs, ## args);				\
 	} while (0)
 
 extern void marker_update_probe_range(struct marker * const *begin,
@@ -206,7 +205,6 @@ extern void marker_update_probe_range(struct marker * const *begin,
 
 /**
  * trace_mark - Marker using code patching
- * @channel: marker channel (where to send the data), not quoted.
  * @name: marker name, not quoted.
  * @format: format string
  * @args...: variable argument list
@@ -214,12 +212,11 @@ extern void marker_update_probe_range(struct marker * const *begin,
  * Places a marker using optimized code patching technique (imv_read())
  * to be enabled when immediate values are present.
  */
-#define trace_mark(channel, name, format, args...) \
-	__trace_mark(0, channel, name, NULL, format, ## args)
+#define trace_mark(name, format, args...) \
+	__trace_mark(0, ust, name, NULL, format, ## args)
 
 /**
  * _trace_mark - Marker using variable read
- * @channel: marker channel (where to send the data), not quoted.
  * @name: marker name, not quoted.
  * @format: format string
  * @args...: variable argument list
@@ -228,12 +225,11 @@ extern void marker_update_probe_range(struct marker * const *begin,
  * enabled. Should be used for markers in code paths where instruction
  * modification based enabling is not welcome.
  */
-#define _trace_mark(channel, name, format, args...) \
-	__trace_mark(1, channel, name, NULL, format, ## args)
+#define _trace_mark(name, format, args...) \
+	__trace_mark(1, ust, name, NULL, format, ## args)
 
 /**
  * trace_mark_tp - Marker in a tracepoint callback
- * @channel: marker channel (where to send the data), not quoted.
  * @name: marker name, not quoted.
  * @tp_name: tracepoint name, not quoted.
  * @tp_cb: tracepoint callback. Should have an associated global symbol so it
@@ -243,8 +239,8 @@ extern void marker_update_probe_range(struct marker * const *begin,
  *
  * Places a marker in a tracepoint callback.
  */
-#define trace_mark_tp(channel, name, tp_name, tp_cb, format, args...)	\
-	__trace_mark_tp(channel, name, NULL, tp_name, tp_cb, format, ## args)
+#define trace_mark_tp(name, tp_name, tp_cb, format, args...)	\
+	__trace_mark_tp(ust, name, NULL, tp_name, tp_cb, format, ## args)
 
 /**
  * MARK_NOARGS - Format string for a marker with no argument.
@@ -346,6 +342,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)	\
 	{								\