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 <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-06-07 17:46:24 +02:00
parent 3da297a60f
commit 30c806a094
2 changed files with 8 additions and 7 deletions

View file

@ -356,9 +356,6 @@ try_again:
if (fd[nr_cpu][counter] < 0) { if (fd[nr_cpu][counter] < 0) {
int err = errno; 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) if (err == EPERM)
die("Permission error - are you root?\n"); die("Permission error - are you root?\n");
@ -376,6 +373,10 @@ try_again:
attr->config = PERF_COUNT_CPU_CLOCK; attr->config = PERF_COUNT_CPU_CLOCK;
goto try_again; 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); exit(-1);
} }

View file

@ -551,10 +551,6 @@ try_again:
if (fd[i][counter] < 0) { if (fd[i][counter] < 0) {
int err = errno; int err = errno;
if (verbose)
error("sys_perf_counter_open() syscall returned with %d (%s)\n",
fd[i][counter], strerror(err));
if (err == EPERM) if (err == EPERM)
die("No permission - are you root?\n"); die("No permission - are you root?\n");
/* /*
@ -572,6 +568,10 @@ try_again:
attr->config = PERF_COUNT_CPU_CLOCK; attr->config = PERF_COUNT_CPU_CLOCK;
goto try_again; 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); exit(-1);
} }
assert(fd[i][counter] >= 0); assert(fd[i][counter] >= 0);