forked from Minki/linux
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>
This commit is contained in:
parent
ae55795ef2
commit
b8631e6ebb
@ -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"
|
||||
|
@ -871,7 +871,7 @@ try_again:
|
||||
int err = errno;
|
||||
|
||||
if (err == EPERM || err == EACCES) {
|
||||
ui__warning_paranoid();
|
||||
ui__error_paranoid();
|
||||
goto out_err;
|
||||
}
|
||||
/*
|
||||
|
@ -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"
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user