aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/perf/builtin-annotate.c4
-rw-r--r--tools/perf/builtin-diff.c4
-rw-r--r--tools/perf/builtin-kmem.c7
-rw-r--r--tools/perf/builtin-report.c7
-rw-r--r--tools/perf/builtin-sched.c7
-rw-r--r--tools/perf/builtin-trace.c7
-rw-r--r--tools/perf/util/event.c9
-rw-r--r--tools/perf/util/session.c16
8 files changed, 21 insertions, 40 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 117bbae844bf..73c202ee0882 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -132,8 +132,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
132{ 132{
133 struct addr_location al; 133 struct addr_location al;
134 134
135 dump_printf("(IP, %d): %d: %p\n", event->header.misc, 135 dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
136 event->ip.pid, (void *)(long)event->ip.ip); 136 event->ip.pid, event->ip.ip);
137 137
138 if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) { 138 if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {
139 fprintf(stderr, "problem processing %d event, skipping it.\n", 139 fprintf(stderr, "problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 924bfb77a6ab..18b3f505f9db 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -42,8 +42,8 @@ static int diff__process_sample_event(event_t *event, struct perf_session *sessi
42 struct addr_location al; 42 struct addr_location al;
43 struct sample_data data = { .period = 1, }; 43 struct sample_data data = { .period = 1, };
44 44
45 dump_printf("(IP, %d): %d: %p\n", event->header.misc, 45 dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
46 event->ip.pid, (void *)(long)event->ip.ip); 46 event->ip.pid, event->ip.ip);
47 47
48 if (event__preprocess_sample(event, session, &al, NULL) < 0) { 48 if (event__preprocess_sample(event, session, &al, NULL) < 0) {
49 pr_warning("problem processing %d event, skipping it.\n", 49 pr_warning("problem processing %d event, skipping it.\n",
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 4af7199c5af7..7323d9dfbce8 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -316,11 +316,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
316 316
317 event__parse_sample(event, session->sample_type, &data); 317 event__parse_sample(event, session->sample_type, &data);
318 318
319 dump_printf("(IP, %d): %d/%d: %p period: %Ld\n", 319 dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
320 event->header.misc, 320 data.pid, data.tid, data.ip, data.period);
321 data.pid, data.tid,
322 (void *)(long)data.ip,
323 (long long)data.period);
324 321
325 thread = perf_session__findnew(session, event->ip.pid); 322 thread = perf_session__findnew(session, event->ip.pid);
326 if (thread == NULL) { 323 if (thread == NULL) {
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 80d691a4191f..4c3d6997995b 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -93,11 +93,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
93 93
94 event__parse_sample(event, session->sample_type, &data); 94 event__parse_sample(event, session->sample_type, &data);
95 95
96 dump_printf("(IP, %d): %d/%d: %p period: %Ld\n", 96 dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
97 event->header.misc, 97 data.pid, data.tid, data.ip, data.period);
98 data.pid, data.tid,
99 (void *)(long)data.ip,
100 (long long)data.period);
101 98
102 if (session->sample_type & PERF_SAMPLE_CALLCHAIN) { 99 if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {
103 unsigned int i; 100 unsigned int i;
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 702322f8fec1..4f5a03e43444 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1621,11 +1621,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
1621 1621
1622 event__parse_sample(event, session->sample_type, &data); 1622 event__parse_sample(event, session->sample_type, &data);
1623 1623
1624 dump_printf("(IP, %d): %d/%d: %p period: %Ld\n", 1624 dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
1625 event->header.misc, 1625 data.pid, data.tid, data.ip, data.period);
1626 data.pid, data.tid,
1627 (void *)(long)data.ip,
1628 (long long)data.period);
1629 1626
1630 thread = perf_session__findnew(session, data.pid); 1627 thread = perf_session__findnew(session, data.pid);
1631 if (thread == NULL) { 1628 if (thread == NULL) {
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 1831434aa938..8e9cbfe608d6 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -75,11 +75,8 @@ static int process_sample_event(event_t *event, struct perf_session *session)
75 75
76 event__parse_sample(event, session->sample_type, &data); 76 event__parse_sample(event, session->sample_type, &data);
77 77
78 dump_printf("(IP, %d): %d/%d: %p period: %Ld\n", 78 dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
79 event->header.misc, 79 data.pid, data.tid, data.ip, data.period);
80 data.pid, data.tid,
81 (void *)(long)data.ip,
82 (long long)data.period);
83 80
84 thread = perf_session__findnew(session, event->ip.pid); 81 thread = perf_session__findnew(session, event->ip.pid);
85 if (thread == NULL) { 82 if (thread == NULL) {
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 4f3e7ef33b83..24ec5be4a1c0 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -313,12 +313,9 @@ int event__process_mmap(event_t *self, struct perf_session *session)
313 struct thread *thread; 313 struct thread *thread;
314 struct map *map; 314 struct map *map;
315 315
316 dump_printf(" %d/%d: [%p(%p) @ %p]: %s\n", 316 dump_printf(" %d/%d: [%#Lx(%#Lx) @ %#Lx]: %s\n",
317 self->mmap.pid, self->mmap.tid, 317 self->mmap.pid, self->mmap.tid, self->mmap.start,
318 (void *)(long)self->mmap.start, 318 self->mmap.len, self->mmap.pgoff, self->mmap.filename);
319 (void *)(long)self->mmap.len,
320 (void *)(long)self->mmap.pgoff,
321 self->mmap.filename);
322 319
323 if (self->mmap.pid == 0) { 320 if (self->mmap.pid == 0) {
324 static const char kmmap_prefix[] = "[kernel.kallsyms."; 321 static const char kmmap_prefix[] = "[kernel.kallsyms.";
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index fd1c5a39a5bb..e3ccdb46d6c4 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -209,9 +209,8 @@ static int perf_session__process_event(struct perf_session *self,
209 trace_event(event); 209 trace_event(event);
210 210
211 if (event->header.type < PERF_RECORD_MAX) { 211 if (event->header.type < PERF_RECORD_MAX) {
212 dump_printf("%p [%p]: PERF_RECORD_%s", 212 dump_printf("%#lx [%#x]: PERF_RECORD_%s",
213 (void *)(offset + head), 213 offset + head, event->header.size,
214 (void *)(long)(event->header.size),
215 event__name[event->header.type]); 214 event__name[event->header.type]);
216 ++event__total[0]; 215 ++event__total[0];
217 ++event__total[event->header.type]; 216 ++event__total[event->header.type];
@@ -362,16 +361,13 @@ more:
362 361
363 size = event->header.size; 362 size = event->header.size;
364 363
365 dump_printf("\n%p [%p]: event: %d\n", 364 dump_printf("\n%#lx [%#x]: event: %d\n",
366 (void *)(offset + head), 365 offset + head, event->header.size, event->header.type);
367 (void *)(long)event->header.size,
368 event->header.type);
369 366
370 if (size == 0 || 367 if (size == 0 ||
371 perf_session__process_event(self, event, ops, offset, head) < 0) { 368 perf_session__process_event(self, event, ops, offset, head) < 0) {
372 dump_printf("%p [%p]: skipping unknown header type: %d\n", 369 dump_printf("%#lx [%#x]: skipping unknown header type: %d\n",
373 (void *)(offset + head), 370 offset + head, event->header.size,
374 (void *)(long)(event->header.size),
375 event->header.type); 371 event->header.type);
376 /* 372 /*
377 * assume we lost track of the stream, check alignment, and 373 * assume we lost track of the stream, check alignment, and
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-13 00:46:27 -0500