X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=a1f55b0b76338f6db9fa7d4c7309b3f7f6ba862c;hp=db4671e0e9805fffe043de3072f7ac8dd9e9e3da;hb=773655f35716237829e6e252e27165ca4044f930;hpb=a4db742aa7a1c19142126e047c7088838d634a51 diff --git a/include/ust/marker.h b/include/ust/marker.h index db4671e..a1f55b0 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -25,20 +25,16 @@ #define _UST_MARKER_H #include -//ust// #include #include -//ust// #include -#include -#include +#include +#include #include +#include +#include -//ust// struct module; -//ust// struct task_struct; -struct marker; +#include -/* To stringify the expansion of a define */ -#define XSTR(d) STR(d) -#define STR(s) #s +struct marker; /** * marker_probe_func - Type of a marker probe function @@ -68,7 +64,7 @@ struct marker { const char *format; /* Marker format string, describing the * variable argument list. */ - DEFINE_IMV(char, state);/* Immediate value state. */ + DEFINE_IMV(char, state);/* Immediate value state. */ char ptype; /* probe type : 0 : single, 1 : multi */ /* Probe wrapper */ u16 channel_id; /* Numeric channel identifier, dynamic */ @@ -79,74 +75,85 @@ struct marker { const char *tp_name; /* Optional tracepoint name */ void *tp_cb; /* Optional tracepoint callback */ void *location; /* Address of marker in code */ -} __attribute__((aligned(8))); - -#define CONFIG_MARKERS -#ifdef CONFIG_MARKERS - -#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique) \ - static const char __old_mstrtab_##channel##_##name[] \ - __attribute__((section("__old_markers_strings"))) \ - = #channel "\0" #name "\0" format; \ - struct registers regs; \ - static struct marker *__pmark_##channel##_##name; \ - static struct marker __old_mark_##channel##_##name \ - __attribute__((section("__old_markers"), aligned(8))) = \ - { __old_mstrtab_##channel##_##name, \ - &__old_mstrtab_##channel##_##name[sizeof(#channel)], \ - &__old_mstrtab_##channel##_##name[sizeof(#channel) + \ - sizeof(#name)], \ - 0, 0, 0, 0, marker_probe_cb, \ - { __mark_empty_function, NULL}, \ - NULL, tp_name_str, tp_cb, NULL }; \ - \ +} __attribute__((aligned(128)));/* + * Aligned on 128 bytes because it is + * globally visible and gcc happily + * align these on the structure size. + */ + +#define GET_MARKER(channel, name) (__mark_##channel##_##name) + +#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m) \ + struct registers regs; \ + \ /* This next asm has to be a basic inline asm (no input/output/clobber), \ - because it must not need %-sign escaping, as we most certainly \ - have some 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" \ - ".string \"" XSTR(name) "\"\n\t" \ - "__mstrtab_" XSTR(channel) "_" XSTR(name) "_format_" XSTR(unique) ":\n\t" \ - ".string " XSTR(format) "\n\t" \ - ".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 */ \ - ".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 "0\n\t" /* marker_probe_closure single.field2 */ \ - _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \ - _ASM_PTR "0\n\t" /* tp_name */ \ - _ASM_PTR "0\n\t" /* tp_cb */ \ - "__mark_location_" XSTR(unique) ":\n\t" \ - _ASM_PTR "(1f)\n\t" /* location */ \ - ".previous\n\t" \ - "1:\n\t" \ - ); \ - asm volatile ( \ - "mov ""__mstrtab_" XSTR(channel) "_" XSTR(name) "_" XSTR(unique) ", %[pmark_struct]\n\t" \ - : [pmark_struct] "=r" (__pmark_##channel##_##name) \ - ); \ - \ + * because it must not require %-sign escaping, as we most certainly \ + * have some %-signs in the format string. \ + */ \ + asm volatile ( \ + /* We only define these symbols if they have not yet been defined. Indeed, \ + * if two markers with the same channel/name are on the same line, they \ + * will try to create the same symbols, resulting in a conflict. This \ + * is not unusual as it can be the result of function inlining. \ + */ \ + ".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t" \ + /*".section __markers_strings\n\t"*/ \ + ".section __markers_strings,\"aw\",@progbits\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" \ + ".string \"" __stringify(name) "\"\n\t" \ + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ":\n\t" \ + ".string " "\"" format "\"" "\n\t" \ + ".previous\n\t" \ + ".endif\n\t" \ + ); \ + asm volatile ( \ + /*".section __markers\n\t"*/ \ + ".section __markers,\"aw\",@progbits\n\t" \ + ".balign 8\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 */ \ + ".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 */ \ + _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 */ \ + _ASM_PTR "0\n\t" /* tp_cb */ \ + _ASM_PTR "(1f)\n\t" /* location */ \ + ".previous\n\t" \ + "1:\n\t" \ + ARCH_COPY_ADDR("%[outptr]") \ + : [outptr] "=r" (m) ); \ + \ save_registers(®s) -#define DEFINE_MARKER(channel, name, format) \ - _DEFINE_MARKER(channel, name, NULL, NULL, format, __COUNTER__) +#define DEFINE_MARKER(channel, name, format, unique, m) \ + _DEFINE_MARKER(channel, name, NULL, NULL, format, unique, m) #define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format) \ - _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format, __COUNTER__) + _DEFINE_MARKER_TP(channel, 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) \ + __attribute__((section("__markers"), aligned(128))) = \ + { __mstrtab_##channel##_##name, \ + &__mstrtab_##channel##_##name[sizeof(#channel)], \ + &__mstrtab_##channel##_##name[sizeof(#channel) + sizeof(#name)], \ + 0, 0, 0, 0, marker_probe_cb, \ + { __mark_empty_function, NULL}, \ + NULL, tp_name_str, tp_cb } /* * Make sure the alignment of the structure in the __markers section will @@ -157,62 +164,43 @@ struct marker { * If generic is true, a variable read is used. * If generic is false, immediate values are used. */ + #define __trace_mark(generic, channel, name, call_private, format, args...) \ + __trace_mark_counter(generic, channel, name, __LINE__, call_private, format, ## args) + +#define __trace_mark_counter(generic, channel, name, unique, call_private, format, args...) \ do { \ - DEFINE_MARKER(channel, name, format); \ + struct marker *m; \ + DEFINE_MARKER(channel, name, format, unique, m); \ __mark_check_format(format, ## args); \ if (!generic) { \ - if (unlikely(imv_read( \ - __pmark_##channel##_##name->state))) \ - (*__pmark_##channel##_##name->call) \ - (__pmark_##channel##_##name, \ - call_private, ®s, ## args); \ + if (unlikely(imv_read(m->state))) \ + (m->call)(m, call_private, ®s, ## args); \ } else { \ - if (unlikely(_imv_read( \ - __pmark_##channel##_##name->state))) \ - (__pmark_##channel##_##name->call) \ - (__pmark_##channel##_##name, \ - call_private, ®s, ## args); \ + if (unlikely(_imv_read(m->state))) \ + (m->call)(m, call_private, ®s, ## args); \ } \ } while (0) -#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, \ - format, args...) \ +#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, format, args...) \ + __trace_mark_tp_counter(channel, name, __LINE__, call_private, tp_name, tp_cb, format, ## args) + +#define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \ do { \ + struct registers regs; \ void __check_tp_type(void) \ { \ - register_trace_##tp_name(tp_cb); \ + register_trace_##tp_name(tp_cb, call_private); \ } \ DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\ __mark_check_format(format, ## args); \ - (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \ + (*GET_MARKER(channel, name).call)(&GET_MARKER(channel, name), \ call_private, ®s, ## args); \ } while (0) extern void marker_update_probe_range(struct marker *begin, struct marker *end); -#define GET_MARKER(channel, name) (__mark_##channel##_##name) - -#else /* !CONFIG_MARKERS */ -#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format) -#define __trace_mark(generic, channel, name, call_private, format, args...) \ - __mark_check_format(format, ## args) -#define __trace_mark_tp(channel, name, call_private, tp_name, tp_cb, \ - format, args...) \ - do { \ - void __check_tp_type(void) \ - { \ - register_trace_##tp_name(tp_cb); \ - } \ - __mark_check_format(format, ## args); \ - } while (0) -static inline void marker_update_probe_range(struct marker *begin, - struct marker *end) -{ } -#define GET_MARKER(channel, name) -#endif /* CONFIG_MARKERS */ - /** * trace_mark - Marker using code patching * @channel: marker channel (where to send the data), not quoted. @@ -235,8 +223,7 @@ static inline void marker_update_probe_range(struct marker *begin, * * Places a marker using a standard memory read (_imv_read()) to be * enabled. Should be used for markers in code paths where instruction - * modification based enabling is not welcome. (__init and __exit functions, - * lockdep, some traps, printk). + * modification based enabling is not welcome. */ #define _trace_mark(channel, name, format, args...) \ __trace_mark(1, channel, name, NULL, format, ## args) @@ -347,43 +334,27 @@ struct lib { struct marker_addr *markers_addr_start; #endif int markers_count; - struct list_head list; + struct cds_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); +extern int marker_unregister_lib(struct marker *markers_start); #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)); \ - } - -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, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ + } \ + \ + static void __attribute__((destructor)) __markers__destroy(void) \ { \ - marker_register_lib(__start___markers, NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ + marker_unregister_lib(__start___markers); \ } 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 */