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

Rename "m" local macro variable to "__marker_counter_ptr".
Rename "regs" local macro variable to "__marker_regs".

Initial report:

The following trivial piece of code will result in corrupt events:

void dump_ackerman_current( int m, int n )
{
    trace_mark( ackerman, current, "m %d n %d", m, n );
}

This is because in ust/marker.h line 173 the definition of the
__trace_mark_counter macro uses a temporary named m (which shadows the
original m). It might be a good idea to use underscore variable names
inside these macros to make naming conflicts less likely.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Reported-by: Paul Wögerer <paul_woegerer@mentor.com>

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 604aa23fa798dec2c72a830090e18d745a0a87da..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            \
@@ -132,7 +132,7 @@ struct marker {
                        ARCH_COPY_ADDR("%[outptr]")                                             \
                : [outptr] "=r" (m) );                                                          \
                                                                                                \
-               save_registers(&regs)
+               save_registers(&__marker_regs)
 
 
 #define DEFINE_MARKER(channel, name, format, unique, m)                                \
@@ -172,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)
 
@@ -189,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);          \
@@ -197,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,