X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=1ccd9a3320e3df35498287b4863807733bcd0cef;hb=6b68d79d118a12c619aa2f6008cf26bdc7dcfbe7;hp=77605009ab3b299403102e5e3b9be140b5953ef0;hpb=443addf602cf18828df3ef75cc82374f2a4f874c;p=ust.git

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 7760500..1ccd9a3 100644
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -105,7 +105,6 @@ struct marker {
 		   have some %-signs in the format string. */					\
 		asm volatile ( 									\
 		     ".section __markers_strings,\"aw\",@progbits\n\t"				\
-		     "__mstrtab_" XSTR(channel) "_" XSTR(name) "_" XSTR(unique) ":\n\t"		\
 		     "__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ":\n\t"	\
 		     ".string \"" XSTR(channel) "\"\n\t"					\
 		     "__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ":\n\t"	\
@@ -115,16 +114,17 @@ struct marker {
 		     ".previous\n\t"								\
 		     ".section __markers,\"aw\",@progbits\n\t"					\
 		     ".align 8\n\t"								\
-		     _ASM_PTR "__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) "\n\t" /* channel string */ \
-		     _ASM_PTR "__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) "\n\t" /* name string */ \
-		     _ASM_PTR "__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(unique) "\n\t" /* format string */ \
+		     "__mark_struct_" XSTR(unique) ":\n\t" \
+		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) ")\n\t" /* channel string */ \
+		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_name_" XSTR(unique) ")\n\t" /* name string */ \
+		     _ASM_PTR "(__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(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 */ \
 		     ".align " XSTR(__SIZEOF_POINTER__) "\n\t" /* alignment */ \
-		     _ASM_PTR "marker_probe_cb\n\t" /* call */ \
-		     _ASM_PTR "__mark_empty_function\n\t" /* marker_probe_closure single.field1 */ \
+		     _ASM_PTR "(marker_probe_cb)\n\t" /* call */ \
+		     _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
 		     _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */ \
 		     _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \
 		     _ASM_PTR "0\n\t" /* tp_name */ \
@@ -135,8 +135,8 @@ struct marker {
 		     "1:\n\t" \
 		); \
 		asm volatile ( \
-		     "mov ""__mstrtab_" XSTR(channel) "_" XSTR(name) "_" XSTR(unique) ", %[pmark_struct]\n\t" \
-		: [pmark_struct] "=r" (__pmark_##channel##_##name) \
+		     "mov ""$__mark_struct_" XSTR(unique) ", %[pmark_struct]\n\t" \
+		: [pmark_struct] "=r" (__pmark_##channel##_##name) :: "memory" \
 		); \
 		\
 		save_registers(&regs)
@@ -350,40 +350,18 @@ struct lib {
 	struct list_head list;
 };
 
-extern int marker_register_lib(struct marker *markers_start,
-			       struct marker_addr *marker_addr_start,
-			       int markers_count);
-
-#ifdef CONFIG_UST_GDB_INTEGRATION
+extern int marker_register_lib(struct marker *markers_start, int markers_count);
 
 #define MARKER_LIB							\
 	extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
 	extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \
-	extern struct marker_addr __start___marker_addr[] __attribute__((weak, visibility("hidden"))); \
-	extern struct marker_addr __stop___marker_addr[] __attribute__((weak, visibility("hidden"))); \
 									\
 	static void __attribute__((constructor)) __markers__init(void)	\
 	{								\
-		marker_register_lib(__start___markers, /*__start___marker_addr*/ NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
+		marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
 	}
 
 extern void marker_set_new_marker_cb(void (*cb)(struct marker *));
 extern void init_markers(void);
 
-#else /* CONFIG_UST_GDB_INTEGRATION */
-
-#define MARKER_LIB							\
-	extern struct marker __start___markers[] __attribute__((weak, visibility("hidden"))); \
-	extern struct marker __stop___markers[] __attribute__((weak, visibility("hidden"))); \
-									\
-	static void __attribute__((constructor)) __markers__init(void)	\
-	{								\
-		marker_register_lib(__start___markers, NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \
-	}
-
-extern void marker_set_new_marker_cb(void (*cb)(struct marker *));
-extern void init_markers(void);
-
-#endif /* CONFIG_UST_GDB_INTEGRATION */
-
 #endif /* _UST_MARKER_H */