diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-11-30 22:48:53 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-12-01 01:58:42 +0300 |
| commit | 5b1c144475a7f2d0ab34d0b9b8414ab18b02a283 (patch) | |
| tree | 401bdf5475133464b307d139e3a3cf3ce8fca848 /tools/perf | |
| parent | 5c891f3840a7a330c96d7203d4bb5be6fa033724 (diff) | |
| download | linux-5b1c144475a7f2d0ab34d0b9b8414ab18b02a283.tar.xz | |
perf debug: Simplify trace_event
No need to check that many times if debug_trace is on.
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/debug.c | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c index e5161e8f9915..01bbe8ecec3f 100644 --- a/tools/perf/util/debug.c +++ b/tools/perf/util/debug.c @@ -57,21 +57,6 @@ void ui__warning(const char *format, ...) } #endif -static int dump_printf_color(const char *fmt, const char *color, ...) -{ - 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; -} - - void trace_event(event_t *event) { unsigned char *raw_event = (void *)event; @@ -81,29 +66,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"); } |