1 files changed, 31 insertions, 25 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index f9c7e3ad1aa7..155749d74350 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -12,8 +12,8 @@
 #include "debug.h"
 #include "util.h"
 
-int verbose = 0;
-bool dump_trace = false;
+int verbose;
+bool dump_trace = false, quiet = false;
 
 int eprintf(int level, const char *fmt, ...)
 {
@@ -46,22 +46,28 @@ int dump_printf(const char *fmt, ...)
         return ret;
 }
 
-static int dump_printf_color(const char *fmt, const char *color, ...)
+#ifdef NO_NEWT_SUPPORT
+void ui__warning(const char *format, ...)
 {
         va_list args;
-        int ret = 0;
-
-        if (dump_trace) {
-                va_start(args, color);
-                ret = color_vfprintf(stdout, color, fmt, args);
-                va_end(args);
-        }
 
-        return ret;
+        va_start(args, format);
+        vfprintf(stderr, format, args);
+        va_end(args);
 }
+#endif
 
+void ui__warning_paranoid(void)
+{
+        ui__warning("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"
+                    "  1 - Disallow cpu events for unpriv\n"
+                    "  2 - Disallow kernel profiling for unpriv\n");
+}
 
-void trace_event(event_t *event)
+void trace_event(union perf_event *event)
 {
         unsigned char *raw_event = (void *)event;
         const char *color = PERF_COLOR_BLUE;
@@ -70,29 +76,29 @@ void trace_event(event_t *event)
         if (!dump_trace)
                 return;
 
-        dump_printf(".");
-        dump_printf_color("\n. ... raw event: size %d bytes\n", color,
-                          event->header.size);
+        printf(".");
+        color_fprintf(stdout, color, "\n. ... raw event: size %d bytes\n",
+                      event->header.size);
 
         for (i = 0; i < event->header.size; i++) {
                 if ((i & 15) == 0) {
-                        dump_printf(".");
-                        dump_printf_color("  %04x: ", color, i);
+                        printf(".");
+                        color_fprintf(stdout, color, "  %04x: ", i);
                 }
 
-                dump_printf_color(" %02x", color, raw_event[i]);
+                color_fprintf(stdout, color, " %02x", raw_event[i]);
 
                 if (((i & 15) == 15) || i == event->header.size-1) {
-                        dump_printf_color("  ", color);
+                        color_fprintf(stdout, color, "  ");
                         for (j = 0; j < 15-(i & 15); j++)
-                                dump_printf_color("   ", color);
+                                color_fprintf(stdout, color, "   ");
                         for (j = i & ~15; j <= i; j++) {
-                                dump_printf_color("%c", color,
-                                                isprint(raw_event[j]) ?
-                                                raw_event[j] : '.');
+                                color_fprintf(stdout, color, "%c",
+                                              isprint(raw_event[j]) ?
+                                              raw_event[j] : '.');
                         }
-                        dump_printf_color("\n", color);
+                        color_fprintf(stdout, color, "\n");
                 }
         }
-        dump_printf(".\n");
+        printf(".\n");
 }