aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-annotate.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2009-12-13 16:50:28 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-14 10:57:16 -0500
commitb3165f414416a717f72a376720564012af5a2e01 (patch)
treeb066e4ae00b7d4bdb7386f4054e6e3ace0b976c3 /tools/perf/builtin-annotate.c
parentec913369733923dbfd6bdff5953a918107059701 (diff)
perf session: Move the global threads list to perf_session
So that we can process two perf.data files. We still need to add a O_MMAP mode for perf_session so that we can do all the mmap stuff in it. 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: <1260741029-4430-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r--tools/perf/builtin-annotate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index a931b133f3ac..795f865c1366 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -131,14 +131,14 @@ static int hist_entry__add(struct addr_location *al, u64 count)
131 return 0; 131 return 0;
132} 132}
133 133
134static int process_sample_event(event_t *event, struct perf_session *session __used) 134static int process_sample_event(event_t *event, struct perf_session *session)
135{ 135{
136 struct addr_location al; 136 struct addr_location al;
137 137
138 dump_printf("(IP, %d): %d: %p\n", event->header.misc, 138 dump_printf("(IP, %d): %d: %p\n", event->header.misc,
139 event->ip.pid, (void *)(long)event->ip.ip); 139 event->ip.pid, (void *)(long)event->ip.ip);
140 140
141 if (event__preprocess_sample(event, &al, symbol_filter) < 0) { 141 if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {
142 fprintf(stderr, "problem processing %d event, skipping it.\n", 142 fprintf(stderr, "problem processing %d event, skipping it.\n",
143 event->header.type); 143 event->header.type);
144 return -1; 144 return -1;
@@ -479,7 +479,7 @@ static int __cmd_annotate(void)
479 } 479 }
480 480
481 if (verbose > 3) 481 if (verbose > 3)
482 threads__fprintf(stdout); 482 perf_session__fprintf(session, stdout);
483 483
484 if (verbose > 2) 484 if (verbose > 2)
485 dsos__fprintf(stdout); 485 dsos__fprintf(stdout);