X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fmarker.h;h=7670648ba4b36738765e440707f8eba0f19003f6;hb=f91aa7301fe975dc6b1d5583f7ffb6c4d2dbf325;hp=55900988028642192657dfc88948ce4f9355502c;hpb=6fa0d97f663351869797d35ddb504489e223fa7c;p=ust.git diff --git a/include/ust/marker.h b/include/ust/marker.h index 5590098..7670648 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -25,23 +25,17 @@ #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; -/* 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 @@ -70,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 */ @@ -86,6 +80,8 @@ struct marker { #define CONFIG_MARKERS #ifdef CONFIG_MARKERS +#define GET_MARKER(channel, name) (__mark_##channel##_##name) + #define _DEFINE_MARKER(channel, name, tp_name_str, tp_cb, format, unique, m) \ struct registers regs; \ \ @@ -93,45 +89,47 @@ struct marker { * 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,\"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 ( \ + /* 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,\"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" \ + /*".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) @@ -140,8 +138,21 @@ struct marker { #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, unique, m) \ - _DEFINE_MARKER(channel, name, #tp_name, tp_cb, 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; \ + static struct marker GET_MARKER(channel, name) \ + __attribute__((section("__markers"), aligned(8))) = \ + { __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 @@ -175,22 +186,20 @@ struct marker { #define __trace_mark_tp_counter(channel, name, unique, call_private, tp_name, tp_cb, format, args...) \ do { \ - struct marker m; \ + 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, unique, m);\ + 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, m) #define __trace_mark(generic, channel, name, call_private, format, args...) \ @@ -200,7 +209,7 @@ extern void marker_update_probe_range(struct marker *begin, do { \ void __check_tp_type(void) \ { \ - register_trace_##tp_name(tp_cb); \ + register_trace_##tp_name(tp_cb, call_private); \ } \ __mark_check_format(format, ## args); \ } while (0)