1 files changed, 74 insertions, 37 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 86d9c7302598..8c4212abd19b 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <api/debug.h>
 
 #include "cache.h"
 #include "color.h"
@@ -22,7 +23,7 @@ int debug_ordered_events;
 static int redirect_to_stderr;
 int debug_data_convert;
 
-static int _eprintf(int level, int var, const char *fmt, va_list args)
+int veprintf(int level, int var, const char *fmt, va_list args)
 {
         int ret = 0;
 
@@ -36,24 +37,19 @@ static int _eprintf(int level, int var, const char *fmt, va_list args)
         return ret;
 }
 
-int veprintf(int level, int var, const char *fmt, va_list args)
-{
-        return _eprintf(level, var, fmt, args);
-}
-
 int eprintf(int level, int var, const char *fmt, ...)
 {
         va_list args;
         int ret;
 
         va_start(args, fmt);
-        ret = _eprintf(level, var, fmt, args);
+        ret = veprintf(level, var, fmt, args);
         va_end(args);
 
         return ret;
 }
 
-static int __eprintf_time(u64 t, const char *fmt, va_list args)
+static int veprintf_time(u64 t, const char *fmt, va_list args)
 {
         int ret = 0;
         u64 secs, usecs, nsecs = t;
@@ -75,7 +71,7 @@ int eprintf_time(int level, int var, u64 t, const char *fmt, ...)
 
         if (var >= level) {
                 va_start(args, fmt);
-                ret = __eprintf_time(t, fmt, args);
+                ret = veprintf_time(t, fmt, args);
                 va_end(args);
         }
 
@@ -91,7 +87,7 @@ void pr_stat(const char *fmt, ...)
         va_list args;
 
         va_start(args, fmt);
-        _eprintf(1, verbose, fmt, args);
+        veprintf(1, verbose, fmt, args);
         va_end(args);
         eprintf(1, verbose, "\n");
 }
@@ -110,40 +106,61 @@ int dump_printf(const char *fmt, ...)
         return ret;
 }
 
+static void trace_event_printer(enum binary_printer_ops op,
+                                unsigned int val, void *extra)
+{
+        const char *color = PERF_COLOR_BLUE;
+        union perf_event *event = (union perf_event *)extra;
+        unsigned char ch = (unsigned char)val;
+
+        switch (op) {
+        case BINARY_PRINT_DATA_BEGIN:
+                printf(".");
+                color_fprintf(stdout, color, "\n. ... raw event: size %d bytes\n",
+                                event->header.size);
+                break;
+        case BINARY_PRINT_LINE_BEGIN:
+                printf(".");
+                break;
+        case BINARY_PRINT_ADDR:
+                color_fprintf(stdout, color, "  %04x: ", val);
+                break;
+        case BINARY_PRINT_NUM_DATA:
+                color_fprintf(stdout, color, " %02x", val);
+                break;
+        case BINARY_PRINT_NUM_PAD:
+                color_fprintf(stdout, color, "   ");
+                break;
+        case BINARY_PRINT_SEP:
+                color_fprintf(stdout, color, "  ");
+                break;
+        case BINARY_PRINT_CHAR_DATA:
+                color_fprintf(stdout, color, "%c",
+                              isprint(ch) ? ch : '.');
+                break;
+        case BINARY_PRINT_CHAR_PAD:
+                color_fprintf(stdout, color, " ");
+                break;
+        case BINARY_PRINT_LINE_END:
+                color_fprintf(stdout, color, "\n");
+                break;
+        case BINARY_PRINT_DATA_END:
+                printf("\n");
+                break;
+        default:
+                break;
+        }
+}
+
 void trace_event(union perf_event *event)
 {
         unsigned char *raw_event = (void *)event;
-        const char *color = PERF_COLOR_BLUE;
-        int i, j;
 
         if (!dump_trace)
                 return;
 
-        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) {
-                        printf(".");
-                        color_fprintf(stdout, color, "  %04x: ", i);
-                }
-
-                color_fprintf(stdout, color, " %02x", raw_event[i]);
-
-                if (((i & 15) == 15) || i == event->header.size-1) {
-                        color_fprintf(stdout, color, "  ");
-                        for (j = 0; j < 15-(i & 15); j++)
-                                color_fprintf(stdout, color, "   ");
-                        for (j = i & ~15; j <= i; j++) {
-                                color_fprintf(stdout, color, "%c",
-                                              isprint(raw_event[j]) ?
-                                              raw_event[j] : '.');
-                        }
-                        color_fprintf(stdout, color, "\n");
-                }
-        }
-        printf(".\n");
+        print_binary(raw_event, event->header.size, 16,
+                     trace_event_printer, event);
 }
 
 static struct debug_variable {
@@ -192,3 +209,23 @@ int perf_debug_option(const char *str)
         free(s);
         return 0;
 }
+
+#define DEBUG_WRAPPER(__n, __l)                         \
+static int pr_ ## __n ## _wrapper(const char *fmt, ...) \
+{                                                       \
+        va_list args;                                   \
+        int ret;                                        \
+                                                        \
+        va_start(args, fmt);                            \
+        ret = veprintf(__l, verbose, fmt, args);        \
+        va_end(args);                                   \
+        return ret;                                     \
+}
+
+DEBUG_WRAPPER(warning, 0);
+DEBUG_WRAPPER(debug, 1);
+
+void perf_debug_setup(void)
+{
+        libapi_set_print(pr_warning_wrapper, pr_warning_wrapper, pr_debug_wrapper);
+}