3 files changed, 105 insertions, 27 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index ff7e86ad1b06..8c4212abd19b 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -106,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 {
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 35b20dd454de..b7766c577b01 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -14,6 +14,7 @@
 #include <limits.h>
 #include <byteswap.h>
 #include <linux/kernel.h>
+#include <linux/log2.h>
 #include <unistd.h>
 #include "callchain.h"
 #include "strlist.h"
@@ -670,3 +671,39 @@ int fetch_current_timestamp(char *buf, size_t sz)
 
         return 0;
 }
+
+void print_binary(unsigned char *data, size_t len,
+                  size_t bytes_per_line, print_binary_t printer,
+                  void *extra)
+{
+        size_t i, j, mask;
+
+        if (!printer)
+                return;
+
+        bytes_per_line = roundup_pow_of_two(bytes_per_line);
+        mask = bytes_per_line - 1;
+
+        printer(BINARY_PRINT_DATA_BEGIN, 0, extra);
+        for (i = 0; i < len; i++) {
+                if ((i & mask) == 0) {
+                        printer(BINARY_PRINT_LINE_BEGIN, -1, extra);
+                        printer(BINARY_PRINT_ADDR, i, extra);
+                }
+
+                printer(BINARY_PRINT_NUM_DATA, data[i], extra);
+
+                if (((i & mask) == mask) || i == len - 1) {
+                        for (j = 0; j < mask-(i & mask); j++)
+                                printer(BINARY_PRINT_NUM_PAD, -1, extra);
+
+                        printer(BINARY_PRINT_SEP, i, extra);
+                        for (j = i & ~mask; j <= i; j++)
+                                printer(BINARY_PRINT_CHAR_DATA, data[j], extra);
+                        for (j = 0; j < mask-(i & mask); j++)
+                                printer(BINARY_PRINT_CHAR_PAD, i, extra);
+                        printer(BINARY_PRINT_LINE_END, -1, extra);
+                }
+        }
+        printer(BINARY_PRINT_DATA_END, -1, extra);
+}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 3dd04089e8be..7015019ee5fb 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -345,4 +345,24 @@ const char *perf_tip(const char *dirpath);
 bool is_regular_file(const char *file);
 int fetch_current_timestamp(char *buf, size_t sz);
 
+enum binary_printer_ops {
+        BINARY_PRINT_DATA_BEGIN,
+        BINARY_PRINT_LINE_BEGIN,
+        BINARY_PRINT_ADDR,
+        BINARY_PRINT_NUM_DATA,
+        BINARY_PRINT_NUM_PAD,
+        BINARY_PRINT_SEP,
+        BINARY_PRINT_CHAR_DATA,
+        BINARY_PRINT_CHAR_PAD,
+        BINARY_PRINT_LINE_END,
+        BINARY_PRINT_DATA_END,
+};
+
+typedef void (*print_binary_t)(enum binary_printer_ops,
+                               unsigned int val,
+                               void *extra);
+
+void print_binary(unsigned char *data, size_t len,
+                  size_t bytes_per_line, print_binary_t printer,
+                  void *extra);
 #endif /* GIT_COMPAT_UTIL_H */