From 246d4ce8107ea16521384c8b2a8fcff354ef2b7c Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 11 Nov 2011 23:10:26 -0200 Subject: [PATCH] perf session: Remove superfluous callchain_cursor member Since we have it in evsel->hists.callchain_cursor, remove it from perf_session. One more step in disentangling several places from requiring a perf_session pointer. Cc: David Ahern Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-rxr5dj3di7ckyfmnz0naku1z@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-report.c | 5 +++-- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-top.c | 4 ++-- tools/perf/util/session.c | 12 ++++++------ tools/perf/util/session.h | 5 ++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 758a287fc07a..b7ab373b9acc 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -65,7 +65,7 @@ static int perf_session__add_hist_entry(struct perf_session *session, struct hist_entry *he; if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { - err = perf_session__resolve_callchain(session, al->thread, + err = perf_session__resolve_callchain(session, evsel, al->thread, sample->callchain, &parent); if (err) return err; @@ -76,7 +76,8 @@ static int perf_session__add_hist_entry(struct perf_session *session, return -ENOMEM; if (symbol_conf.use_callchain) { - err = callchain_append(he->callchain, &session->callchain_cursor, + err = callchain_append(he->callchain, + &evsel->hists.callchain_cursor, sample->period); if (err) return err; diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 2f62a2952269..47545e9c9b27 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -384,7 +384,7 @@ static void process_event(union perf_event *event __unused, printf(" "); else printf("\n"); - perf_session__print_ip(event, sample, session, + perf_session__print_ip(event, evsel, sample, session, PRINT_FIELD(SYM), PRINT_FIELD(DSO)); } diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 04288ee223ed..9b3bbb40d46f 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -777,7 +777,7 @@ static void perf_event__process_sample(const union perf_event *event, if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { - err = perf_session__resolve_callchain(session, al.thread, + err = perf_session__resolve_callchain(session, evsel, al.thread, sample->callchain, &parent); if (err) return; @@ -790,7 +790,7 @@ static void perf_event__process_sample(const union perf_event *event, } if (symbol_conf.use_callchain) { - err = callchain_append(he->callchain, &session->callchain_cursor, + err = callchain_append(he->callchain, &evsel->hists.callchain_cursor, sample->period); if (err) return; diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 6e7d5f54b37d..734358b51ed1 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -216,7 +216,7 @@ static bool symbol__match_parent_regex(struct symbol *sym) return 0; } -int perf_session__resolve_callchain(struct perf_session *self, +int perf_session__resolve_callchain(struct perf_session *self, struct perf_evsel *evsel, struct thread *thread, struct ip_callchain *chain, struct symbol **parent) @@ -225,7 +225,7 @@ int perf_session__resolve_callchain(struct perf_session *self, unsigned int i; int err; - callchain_cursor_reset(&self->callchain_cursor); + callchain_cursor_reset(&evsel->hists.callchain_cursor); for (i = 0; i < chain->nr; i++) { u64 ip; @@ -261,7 +261,7 @@ int perf_session__resolve_callchain(struct perf_session *self, break; } - err = callchain_cursor_append(&self->callchain_cursor, + err = callchain_cursor_append(&evsel->hists.callchain_cursor, ip, al.map, al.sym); if (err) return err; @@ -1254,14 +1254,14 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, return NULL; } -void perf_session__print_ip(union perf_event *event, +void perf_session__print_ip(union perf_event *event, struct perf_evsel *evsel, struct perf_sample *sample, struct perf_session *session, int print_sym, int print_dso) { struct addr_location al; const char *symname, *dsoname; - struct callchain_cursor *cursor = &session->callchain_cursor; + struct callchain_cursor *cursor = &evsel->hists.callchain_cursor; struct callchain_cursor_node *node; if (perf_event__preprocess_sample(event, session, &al, sample, @@ -1273,7 +1273,7 @@ void perf_session__print_ip(union perf_event *event, if (symbol_conf.use_callchain && sample->callchain) { - if (perf_session__resolve_callchain(session, al.thread, + if (perf_session__resolve_callchain(session, evsel, al.thread, sample->callchain, NULL) != 0) { if (verbose) error("Failed to resolve callchain. Skipping\n"); diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 13bd5e0a0691..d2f430367713 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -50,7 +50,6 @@ struct perf_session { int cwdlen; char *cwd; struct ordered_samples ordered_samples; - struct callchain_cursor callchain_cursor; char filename[0]; }; @@ -100,7 +99,7 @@ int __perf_session__process_events(struct perf_session *self, int perf_session__process_events(struct perf_session *self, struct perf_event_ops *event_ops); -int perf_session__resolve_callchain(struct perf_session *self, +int perf_session__resolve_callchain(struct perf_session *self, struct perf_evsel *evsel, struct thread *thread, struct ip_callchain *chain, struct symbol **parent); @@ -169,7 +168,7 @@ static inline int perf_session__parse_sample(struct perf_session *session, struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, unsigned int type); -void perf_session__print_ip(union perf_event *event, +void perf_session__print_ip(union perf_event *event, struct perf_evsel *evsel, struct perf_sample *sample, struct perf_session *session, int print_sym, int print_dso); -- 2.39.5