diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-26 08:02:55 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-26 13:12:01 -0200 |
| commit | b8631e6ebb3aa033e21d68dd75029aceb96b79cd (patch) | |
| tree | 08dc191dab34721847e1212ac32c00bcffc1d6bd /tools | |
| parent | ae55795ef2d9ba71d46e4111b87a4d0cde93abea (diff) | |
| download | op-kernel-dev-b8631e6ebb3aa033e21d68dd75029aceb96b79cd.zip op-kernel-dev-b8631e6ebb3aa033e21d68dd75029aceb96b79cd.tar.gz | |
perf ui: Rename ui__warning_paranoid to ui__error_paranoid
As it will exit the tool after the user is notified.
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
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-vy06m8xzlvkhr8tk7nylhbng@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/builtin-record.c | 2 | ||||
| -rw-r--r-- | tools/perf/builtin-top.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/debug.c | 4 | ||||
| -rw-r--r-- | tools/perf/util/debug.h | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 40088a5..6ab58cc 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -298,7 +298,7 @@ try_again: int err = errno; if (err == EPERM || err == EACCES) { - ui__warning_paranoid(); + ui__error_paranoid(); exit(EXIT_FAILURE); } else if (err == ENODEV && cpu_list) { die("No such device - did you specify" diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index d2fc754..31aa82c 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -871,7 +871,7 @@ try_again: int err = errno; if (err == EPERM || err == EACCES) { - ui__warning_paranoid(); + ui__error_paranoid(); goto out_err; } /* diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c index 155749d..5563403 100644 --- a/tools/perf/util/debug.c +++ b/tools/perf/util/debug.c @@ -57,9 +57,9 @@ void ui__warning(const char *format, ...) } #endif -void ui__warning_paranoid(void) +void ui__error_paranoid(void) { - ui__warning("Permission error - are you root?\n" + ui__error("Permission error - are you root?\n" "Consider tweaking /proc/sys/kernel/perf_event_paranoid:\n" " -1 - Not paranoid at all\n" " 0 - Disallow raw tracepoint access for unpriv\n" diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h index 9c59b95..16cc752 100644 --- a/tools/perf/util/debug.h +++ b/tools/perf/util/debug.h @@ -21,14 +21,16 @@ static inline int ui_helpline__show_help(const char *format __used, va_list ap _ static inline void ui_progress__update(u64 curr __used, u64 total __used, const char *title __used) {} + +#define ui__error(format, arg...) ui__warning(format, ##arg) #else extern char ui_helpline__last_msg[]; int ui_helpline__show_help(const char *format, va_list ap); #include "ui/progress.h" +void ui__error(const char *format, ...) __attribute__((format(printf, 1, 2))); #endif void ui__warning(const char *format, ...) __attribute__((format(printf, 1, 2))); -void ui__warning_paranoid(void); -void ui__error(const char *format, ...) __attribute__((format(printf, 1, 2))); +void ui__error_paranoid(void); #endif /* __PERF_DEBUG_H */ |
