X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=0e0b466b994546337c61e3d95e7714837e8c49ad;hb=7166e240639cec06f4273f65059300f98b5296f6;hp=0c32586a58b6721708208fda7f4d469866168c5e;hpb=2782fc4bdcc62e3448c59f30dbb07d88d901a597;p=ust.git diff --git a/include/ust/marker.h b/include/ust/marker.h index 0c32586..0e0b466 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -21,21 +21,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _LINUX_MARKER_H -#define _LINUX_MARKER_H +#ifndef _UST_MARKER_H +#define _UST_MARKER_H #include -//ust// #include #include -//ust// #include #include -#include +#include #include -//ust// struct module; -//ust// struct task_struct; +#include + struct marker; +/* To stringify the expansion of a define */ +#define XSTR(d) STR(d) +#define STR(s) #s + /** * marker_probe_func - Type of a marker probe function * @mdata: marker data @@ -80,11 +82,69 @@ struct marker { #define CONFIG_MARKERS #ifdef CONFIG_MARKERS -#define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format) \ +#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 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_" XSTR(channel) "_" XSTR(name) "_channel_" XSTR(unique) "\n\t" \ + /*".section __markers_strings\n\t"*/ \ + ".section __markers_strings,\"aw\",@progbits\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 " "\"" 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_" 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 */ \ + ".balign " XSTR(__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" \ + ARCH_COPY_ADDR("%[outptr]") \ + "1:\n\t" \ + : [outptr] "=r" (m) ); \ + \ + save_registers(®s) + + +#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_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; \ - struct registers regs; \ static struct marker __mark_##channel##_##name \ __attribute__((section("__markers"), aligned(8))) = \ { __mstrtab_##channel##_##name, \ @@ -93,21 +153,7 @@ struct marker { sizeof(#name)], \ 0, 0, 0, 0, marker_probe_cb, \ { __mark_empty_function, NULL}, \ - NULL, tp_name_str, tp_cb, NULL }; \ - asm (".section __marker_addr,\"aw\",@progbits\n\t" \ - _ASM_PTR "%c[marker_struct], (1f)\n\t" \ - ".previous\n\t" \ - "1:\n\t" \ - :: [marker_struct] "i" (&__mark_##channel##_##name));\ - save_registers(®s) - - - -#define DEFINE_MARKER(channel, name, format) \ - _DEFINE_MARKER(channel, name, NULL, NULL, format) - -#define DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format) \ - _DEFINE_MARKER(channel, name, #tp_name, tp_cb, format) + NULL, tp_name_str, tp_cb } /* * Make sure the alignment of the structure in the __markers section will @@ -118,33 +164,35 @@ 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( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##channel##_##name, \ - call_private, ®s, ## args); \ + if (unlikely(imv_read(m->state))) \ + (m->call)(m, call_private, ®s, ## args); \ } else { \ - if (unlikely(_imv_read( \ - __mark_##channel##_##name.state))) \ - (*__mark_##channel##_##name.call) \ - (&__mark_##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 marker m; \ void __check_tp_type(void) \ { \ register_trace_##tp_name(tp_cb); \ } \ - DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format);\ + DEFINE_MARKER_TP(channel, name, tp_name, tp_cb, format, unique, m);\ __mark_check_format(format, ## args); \ (*__mark_##channel##_##name.call)(&__mark_##channel##_##name, \ call_private, ®s, ## args); \ @@ -156,7 +204,7 @@ extern void marker_update_probe_range(struct marker *begin, #define GET_MARKER(channel, name) (__mark_##channel##_##name) #else /* !CONFIG_MARKERS */ -#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format) +#define DEFINE_MARKER(channel, name, tp_name, tp_cb, format, m) #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, \ @@ -196,8 +244,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) @@ -304,25 +351,31 @@ struct marker_addr { struct lib { struct marker *markers_start; +#ifdef CONFIG_UST_GDB_INTEGRATION struct marker_addr *markers_addr_start; +#endif int markers_count; struct list_head list; }; -extern int marker_register_lib(struct marker *markers_start, struct marker_addr *marker_addr_start, int markers_count); - -#define MARKER_LIB \ -extern struct marker __start___markers[] __attribute__((visibility("hidden"))); \ -extern struct marker __stop___markers[] __attribute__((visibility("hidden"))); \ -extern struct marker_addr __start___marker_addr[] __attribute__((visibility("hidden"))); \ -extern struct marker_addr __stop___marker_addr[] __attribute__((visibility("hidden"))); \ - \ -static void __attribute__((constructor)) __markers__init(void) \ -{ \ - marker_register_lib(__start___markers, __start___marker_addr, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker)); \ -} +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"))); \ + \ + 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_unregister_lib(__start___markers); \ + } extern void marker_set_new_marker_cb(void (*cb)(struct marker *)); extern void init_markers(void); -#endif +#endif /* _UST_MARKER_H */