perf top: Fix counter name fixup when fallbacking to cpu-clock
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 25 May 2012 17:49:51 +0000 (14:49 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 25 May 2012 17:59:37 +0000 (14:59 -0300)
In 40491eaa "perf top: Update event name when falling back to cpu-clock"
we freed counter->name but didn't reset it to NULL, then when setting it
to the result of event_name(), event_name() would use the cached value,
which by now was overwritten and thus we got garbage or a zero lenght
string.

Fix it by just freeing and setting counter->name to NULL, this way
event_name() when called afterwards, will find the right counter name
and cache it again.

Found while trying 'cycles:pp' on a machine were :pp couldn't be
honoured. Probably the best fallback here is to tell the user that that
level of precision is not available on the PMU and then go removing 'p',
levels of precision till we get to play 'cycles' and if even that fails,
_then_ get to 'cpu-clock'.

But that is the matter for another patch, this one just needs to fix the
caching issue, which in the end will show 'cpu-clock' when tools ask for
the event name being used, which clarifies things for the user, that
will see that 'cycles:pp' or whatever not support event is not being
used, some sort of fallback happened.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-w1neie2dqli89we1bzwkf4id@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-top.c

index 6031dce..d4a5f9b 100644 (file)
@@ -953,7 +953,7 @@ try_again:
                                attr->config = PERF_COUNT_SW_CPU_CLOCK;
                                if (counter->name) {
                                        free(counter->name);
-                                       counter->name = strdup(event_name(counter));
+                                       counter->name = NULL;
                                }
                                goto try_again;
                        }