perf_counter tools: Handle kernels with !CONFIG_PERF_COUNTER
Commit-ID: 30c806a094493beb7691bc7957dfa02dee96230a Gitweb: http://git.kernel.org/tip/30c806a094493beb7691bc7957dfa02dee96230a Author: Ingo Molnar <[email protected]> AuthorDate: Sun, 7 Jun 2009 17:46:24 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 7 Jun 2009 17:46:24 +0200
perf_counter tools: Handle kernels with !CONFIG_PERF_COUNTER
If perf is run on a !CONFIG_PERF_COUNTER kernel right now it bails out with no messages or with confusing messages.
Standardize this case some more and explain the situation.
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- tools/perf/builtin-record.c | 7 ++++--- tools/perf/builtin-top.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-)
tools/perf/builtin-record.c +4 -3
@@ -356,9 +356,6 @@ try_again:if (fd[nr_cpu][counter] <0 ) {int err = errno; -if (verbose) -error ("sys_perf_counter_open() syscall returned with %d (%s)\n" , - fd[nr_cpu][counter],strerror (err));if (err ==EPERM )die ("Permission error - are you root?\n" );
@@ -376,6 +373,10 @@ try_again: attr->config =PERF_COUNT_CPU_CLOCK ; goto try_again; } +printf ("\n" ); +error ("perfcounter syscall returned with %d (%s)\n" , + fd[nr_cpu][counter],strerror (err)); +die ("No CONFIG_PERF_COUNTERS=y kernel support configured?\n" );exit (-1 ); }
tools/perf/builtin-top.c +4 -4
@@ -551,10 +551,6 @@ try_again:if (fd[i][counter] <0 ) {int err = errno; -if (verbose) -error ("sys_perf_counter_open() syscall returned with %d (%s)\n" , - fd[i][counter],strerror (err)); -if (err ==EPERM )die ("No permission - are you root?\n" );/*
@@ -572,6 +568,10 @@ try_again: attr->config =PERF_COUNT_CPU_CLOCK ; goto try_again; } +printf ("\n" ); +error ("perfcounter syscall returned with %d (%s)\n" , + fd[i][counter],strerror (err)); +die ("No CONFIG_PERF_COUNTERS=y kernel support configured?\n" );exit (-1 ); }assert (fd[i][counter] >=0 );