leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf ui: Rename ui__warning_paranoid to ui__error_paranoid

Browse Source 
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>
This commit is contained in:
Arnaldo Carvalho de Melo 2011-10-26 08:02:55 -02:00
parent ae55795ef2
commit b8631e6ebb
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-record.c
View File

@ -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"

2
tools/perf/builtin-top.c
View File

@ -871,7 +871,7 @@ try_again:
int err = errno;
if (err == EPERM || err == EACCES) {
ui__warning_paranoid();
ui__error_paranoid();
goto out_err;
}
/*

4
tools/perf/util/debug.c
View File

@ -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"

6
tools/perf/util/debug.h
View File

@ -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 */