84c104ad42
The loop counter math in trace_event was much more complicated than necessary, resulting in incorrectly decoding the human-readable portion of the partial last line of hexdump in "perf trace -D" output: . 0020: 00 00 00 00 00 00 00 00 2f 73 62 69 6e 2f 69 6e ......../sbin/i . 0030: 69 74 00 00 00 00 00 00 /sbin/i With this fixed (and simpler!) code, we get the correct output: . 0020: 00 00 00 00 00 00 00 00 2f 73 62 69 6e 2f 69 6e ......../sbin/in . 0030: 69 74 00 00 00 00 00 00 it...... Cc: Ingo Molnar <mingo@elte.hu> LPU-Reference: <20100612024404.GA24469@hexapodia.org> Signed-off-by: Andy Isaacson <adi@hexapodia.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
98 lines
1.7 KiB
C
98 lines
1.7 KiB
C
/* For general debugging purposes */
|
|
|
|
#include "../perf.h"
|
|
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
|
|
#include "cache.h"
|
|
#include "color.h"
|
|
#include "event.h"
|
|
#include "debug.h"
|
|
#include "util.h"
|
|
|
|
int verbose = 0;
|
|
bool dump_trace = false;
|
|
|
|
int eprintf(int level, const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int ret = 0;
|
|
|
|
if (verbose >= level) {
|
|
va_start(args, fmt);
|
|
if (use_browser > 0)
|
|
ret = browser__show_help(fmt, args);
|
|
else
|
|
ret = vfprintf(stderr, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int dump_printf(const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
int ret = 0;
|
|
|
|
if (dump_trace) {
|
|
va_start(args, fmt);
|
|
ret = vprintf(fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
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;
|
|
const char *color = PERF_COLOR_BLUE;
|
|
int i, j;
|
|
|
|
if (!dump_trace)
|
|
return;
|
|
|
|
dump_printf(".");
|
|
dump_printf_color("\n. ... raw event: size %d bytes\n", color,
|
|
event->header.size);
|
|
|
|
for (i = 0; i < event->header.size; i++) {
|
|
if ((i & 15) == 0) {
|
|
dump_printf(".");
|
|
dump_printf_color(" %04x: ", color, i);
|
|
}
|
|
|
|
dump_printf_color(" %02x", color, raw_event[i]);
|
|
|
|
if (((i & 15) == 15) || i == event->header.size-1) {
|
|
dump_printf_color(" ", color);
|
|
for (j = 0; j < 15-(i & 15); j++)
|
|
dump_printf_color(" ", color);
|
|
for (j = i & ~15; j <= i; j++) {
|
|
dump_printf_color("%c", color,
|
|
isprint(raw_event[j]) ?
|
|
raw_event[j] : '.');
|
|
}
|
|
dump_printf_color("\n", color);
|
|
}
|
|
}
|
|
dump_printf(".\n");
|
|
}
|