1 files changed, 48 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(".");
+        print_binary(raw_event, event->header.size, 16,
-        color_fprintf(stdout, color, "\n. ... raw event: size %d bytes\n",
+                     trace_event_printer, event);
-                      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");
 }
 static struct debug_variable {

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, ...)
106	return ret;	106	return ret;
107	}	107	}
108		108
		109	static void trace_event_printer(enum binary_printer_ops op,
		110	unsigned int val, void *extra)
		111	{
		112	const char *color = PERF_COLOR_BLUE;
		113	union perf_event event = (union perf_event )extra;
		114	unsigned char ch = (unsigned char)val;
		115
		116	switch (op) {
		117	case BINARY_PRINT_DATA_BEGIN:
		118	printf(".");
		119	color_fprintf(stdout, color, "\n. ... raw event: size %d bytes\n",
		120	event->header.size);
		121	break;
		122	case BINARY_PRINT_LINE_BEGIN:
		123	printf(".");
		124	break;
		125	case BINARY_PRINT_ADDR:
		126	color_fprintf(stdout, color, " %04x: ", val);
		127	break;
		128	case BINARY_PRINT_NUM_DATA:
		129	color_fprintf(stdout, color, " %02x", val);
		130	break;
		131	case BINARY_PRINT_NUM_PAD:
		132	color_fprintf(stdout, color, " ");
		133	break;
		134	case BINARY_PRINT_SEP:
		135	color_fprintf(stdout, color, " ");
		136	break;
		137	case BINARY_PRINT_CHAR_DATA:
		138	color_fprintf(stdout, color, "%c",
		139	isprint(ch) ? ch : '.');
		140	break;
		141	case BINARY_PRINT_CHAR_PAD:
		142	color_fprintf(stdout, color, " ");
		143	break;
		144	case BINARY_PRINT_LINE_END:
		145	color_fprintf(stdout, color, "\n");
		146	break;
		147	case BINARY_PRINT_DATA_END:
		148	printf("\n");
		149	break;
		150	default:
		151	break;
		152	}
		153	}
		154
109	void trace_event(union perf_event *event)	155	void trace_event(union perf_event *event)
110	{	156	{
111	unsigned char raw_event = (void )event;	157	unsigned char raw_event = (void )event;
112	const char *color = PERF_COLOR_BLUE;
113	int i, j;
114		158
115	if (!dump_trace)	159	if (!dump_trace)
116	return;	160	return;
117		161
118	printf(".");	162	print_binary(raw_event, event->header.size, 16,
119	color_fprintf(stdout, color, "\n. ... raw event: size %d bytes\n",	163	trace_event_printer, event);
120	event->header.size);
121
122	for (i = 0; i < event->header.size; i++) {
123	if ((i & 15) == 0) {
124	printf(".");
125	color_fprintf(stdout, color, " %04x: ", i);
126	}
127
128	color_fprintf(stdout, color, " %02x", raw_event[i]);
129
130	if (((i & 15) == 15) \|\| i == event->header.size-1) {
131	color_fprintf(stdout, color, " ");
132	for (j = 0; j < 15-(i & 15); j++)
133	color_fprintf(stdout, color, " ");
134	for (j = i & ~15; j <= i; j++) {
135	color_fprintf(stdout, color, "%c",
136	isprint(raw_event[j]) ?
137	raw_event[j] : '.');
138	}
139	color_fprintf(stdout, color, "\n");
140	}
141	}
142	printf(".\n");
143	}	164	}
144		165
145	static struct debug_variable {	166	static struct debug_variable {