perf tools: Don't cast RIP to pointers
Since they can come from another architecture with bigger pointers, i.e. processing a 64-bit perf.data on a 32-bit arch. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> 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> LKML-Reference: <1263478990-8200-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
66aeb6d5cb
commit
0d755034db
|
@ -132,8 +132,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
|
||||||
{
|
{
|
||||||
struct addr_location al;
|
struct addr_location al;
|
||||||
|
|
||||||
dump_printf("(IP, %d): %d: %p\n", event->header.misc,
|
dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
|
||||||
event->ip.pid, (void *)(long)event->ip.ip);
|
event->ip.pid, event->ip.ip);
|
||||||
|
|
||||||
if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {
|
if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {
|
||||||
fprintf(stderr, "problem processing %d event, skipping it.\n",
|
fprintf(stderr, "problem processing %d event, skipping it.\n",
|
||||||
|
|
|
@ -42,8 +42,8 @@ static int diff__process_sample_event(event_t *event, struct perf_session *sessi
|
||||||
struct addr_location al;
|
struct addr_location al;
|
||||||
struct sample_data data = { .period = 1, };
|
struct sample_data data = { .period = 1, };
|
||||||
|
|
||||||
dump_printf("(IP, %d): %d: %p\n", event->header.misc,
|
dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
|
||||||
event->ip.pid, (void *)(long)event->ip.ip);
|
event->ip.pid, event->ip.ip);
|
||||||
|
|
||||||
if (event__preprocess_sample(event, session, &al, NULL) < 0) {
|
if (event__preprocess_sample(event, session, &al, NULL) < 0) {
|
||||||
pr_warning("problem processing %d event, skipping it.\n",
|
pr_warning("problem processing %d event, skipping it.\n",
|
||||||
|
|
|
@ -316,11 +316,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
|
||||||
|
|
||||||
event__parse_sample(event, session->sample_type, &data);
|
event__parse_sample(event, session->sample_type, &data);
|
||||||
|
|
||||||
dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
|
dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
|
||||||
event->header.misc,
|
data.pid, data.tid, data.ip, data.period);
|
||||||
data.pid, data.tid,
|
|
||||||
(void *)(long)data.ip,
|
|
||||||
(long long)data.period);
|
|
||||||
|
|
||||||
thread = perf_session__findnew(session, event->ip.pid);
|
thread = perf_session__findnew(session, event->ip.pid);
|
||||||
if (thread == NULL) {
|
if (thread == NULL) {
|
||||||
|
|
|
@ -93,11 +93,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
|
||||||
|
|
||||||
event__parse_sample(event, session->sample_type, &data);
|
event__parse_sample(event, session->sample_type, &data);
|
||||||
|
|
||||||
dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
|
dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
|
||||||
event->header.misc,
|
data.pid, data.tid, data.ip, data.period);
|
||||||
data.pid, data.tid,
|
|
||||||
(void *)(long)data.ip,
|
|
||||||
(long long)data.period);
|
|
||||||
|
|
||||||
if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {
|
if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
|
@ -1621,11 +1621,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
|
||||||
|
|
||||||
event__parse_sample(event, session->sample_type, &data);
|
event__parse_sample(event, session->sample_type, &data);
|
||||||
|
|
||||||
dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
|
dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
|
||||||
event->header.misc,
|
data.pid, data.tid, data.ip, data.period);
|
||||||
data.pid, data.tid,
|
|
||||||
(void *)(long)data.ip,
|
|
||||||
(long long)data.period);
|
|
||||||
|
|
||||||
thread = perf_session__findnew(session, data.pid);
|
thread = perf_session__findnew(session, data.pid);
|
||||||
if (thread == NULL) {
|
if (thread == NULL) {
|
||||||
|
|
|
@ -75,11 +75,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
|
||||||
|
|
||||||
event__parse_sample(event, session->sample_type, &data);
|
event__parse_sample(event, session->sample_type, &data);
|
||||||
|
|
||||||
dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
|
dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
|
||||||
event->header.misc,
|
data.pid, data.tid, data.ip, data.period);
|
||||||
data.pid, data.tid,
|
|
||||||
(void *)(long)data.ip,
|
|
||||||
(long long)data.period);
|
|
||||||
|
|
||||||
thread = perf_session__findnew(session, event->ip.pid);
|
thread = perf_session__findnew(session, event->ip.pid);
|
||||||
if (thread == NULL) {
|
if (thread == NULL) {
|
||||||
|
|
|
@ -313,12 +313,9 @@ int event__process_mmap(event_t *self, struct perf_session *session)
|
||||||
struct thread *thread;
|
struct thread *thread;
|
||||||
struct map *map;
|
struct map *map;
|
||||||
|
|
||||||
dump_printf(" %d/%d: [%p(%p) @ %p]: %s\n",
|
dump_printf(" %d/%d: [%#Lx(%#Lx) @ %#Lx]: %s\n",
|
||||||
self->mmap.pid, self->mmap.tid,
|
self->mmap.pid, self->mmap.tid, self->mmap.start,
|
||||||
(void *)(long)self->mmap.start,
|
self->mmap.len, self->mmap.pgoff, self->mmap.filename);
|
||||||
(void *)(long)self->mmap.len,
|
|
||||||
(void *)(long)self->mmap.pgoff,
|
|
||||||
self->mmap.filename);
|
|
||||||
|
|
||||||
if (self->mmap.pid == 0) {
|
if (self->mmap.pid == 0) {
|
||||||
static const char kmmap_prefix[] = "[kernel.kallsyms.";
|
static const char kmmap_prefix[] = "[kernel.kallsyms.";
|
||||||
|
|
|
@ -209,9 +209,8 @@ static int perf_session__process_event(struct perf_session *self,
|
||||||
trace_event(event);
|
trace_event(event);
|
||||||
|
|
||||||
if (event->header.type < PERF_RECORD_MAX) {
|
if (event->header.type < PERF_RECORD_MAX) {
|
||||||
dump_printf("%p [%p]: PERF_RECORD_%s",
|
dump_printf("%#lx [%#x]: PERF_RECORD_%s",
|
||||||
(void *)(offset + head),
|
offset + head, event->header.size,
|
||||||
(void *)(long)(event->header.size),
|
|
||||||
event__name[event->header.type]);
|
event__name[event->header.type]);
|
||||||
++event__total[0];
|
++event__total[0];
|
||||||
++event__total[event->header.type];
|
++event__total[event->header.type];
|
||||||
|
@ -362,16 +361,13 @@ more:
|
||||||
|
|
||||||
size = event->header.size;
|
size = event->header.size;
|
||||||
|
|
||||||
dump_printf("\n%p [%p]: event: %d\n",
|
dump_printf("\n%#lx [%#x]: event: %d\n",
|
||||||
(void *)(offset + head),
|
offset + head, event->header.size, event->header.type);
|
||||||
(void *)(long)event->header.size,
|
|
||||||
event->header.type);
|
|
||||||
|
|
||||||
if (size == 0 ||
|
if (size == 0 ||
|
||||||
perf_session__process_event(self, event, ops, offset, head) < 0) {
|
perf_session__process_event(self, event, ops, offset, head) < 0) {
|
||||||
dump_printf("%p [%p]: skipping unknown header type: %d\n",
|
dump_printf("%#lx [%#x]: skipping unknown header type: %d\n",
|
||||||
(void *)(offset + head),
|
offset + head, event->header.size,
|
||||||
(void *)(long)(event->header.size),
|
|
||||||
event->header.type);
|
event->header.type);
|
||||||
/*
|
/*
|
||||||
* assume we lost track of the stream, check alignment, and
|
* assume we lost track of the stream, check alignment, and
|
||||||
|
|
Loading…
Reference in a new issue