Rename local variables "m" and "regs" to less conflicting names

[ust.git] / include / ust / marker.h

diff --git a/include/ust/marker.h b/include/ust/marker.h
index cac71ffc59fe641ade37b47c8daa0a66dbc57275..29e84cc8f8360eba701234fec62d95dc06a0779d 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -80,7 +80,7 @@ struct marker {
 #define GET_MARKER(channel, name)      (__mark_##channel##_##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,15 +125,14 @@ 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)                                \
@@ -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, 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,7 +189,7 @@ 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);          \
@@ -198,7 +197,7 @@ struct marker {
                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);                          \
+                       call_private, &__marker_regs, ## args);                         \
        } while (0)
 
 extern void marker_update_probe_range(struct marker * const *begin,
@@ -344,19 +343,21 @@ extern int marker_register_lib(struct marker * const *markers_start, int markers
 extern int marker_unregister_lib(struct marker * const *markers_start);
 
 #define MARKER_LIB                                                     \
-       extern struct marker * const __start___markers[] __attribute__((weak, visibility("hidden"))); \
-       extern struct marker * const __stop___markers[] __attribute__((weak, visibility("hidden"))); \
+       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)  \
        {                                                               \
-               marker_register_lib(__start___markers,                  \
-                       (((long)__stop___markers) - ((long)__start___markers))  \
-                               / sizeof(*__start___markers));          \
-       } \
-       \
-       static void __attribute__((destructor)) __markers__destroy(void)        \
+               marker_register_lib(__start___markers_ptrs,             \
+                                   __stop___markers_ptrs               \
+                                   - __start___markers_ptrs);          \
+       }                                                               \
+                                                                       \
+       static void __attribute__((destructor)) __markers__destroy(void)\
        {                                                               \
-               marker_unregister_lib(__start___markers); \
+               marker_unregister_lib(__start___markers_ptrs);          \
        }
 
 extern void marker_set_new_marker_cb(void (*cb)(struct marker *));