提交 246d4ce8 编写于 作者: A Arnaldo Carvalho de Melo

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 <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-rxr5dj3di7ckyfmnz0naku1z@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 10d0f086
...@@ -65,7 +65,7 @@ static int perf_session__add_hist_entry(struct perf_session *session, ...@@ -65,7 +65,7 @@ static int perf_session__add_hist_entry(struct perf_session *session,
struct hist_entry *he; struct hist_entry *he;
if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { 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); sample->callchain, &parent);
if (err) if (err)
return err; return err;
...@@ -76,7 +76,8 @@ static int perf_session__add_hist_entry(struct perf_session *session, ...@@ -76,7 +76,8 @@ static int perf_session__add_hist_entry(struct perf_session *session,
return -ENOMEM; return -ENOMEM;
if (symbol_conf.use_callchain) { if (symbol_conf.use_callchain) {
err = callchain_append(he->callchain, &session->callchain_cursor, err = callchain_append(he->callchain,
&evsel->hists.callchain_cursor,
sample->period); sample->period);
if (err) if (err)
return err; return err;
......
...@@ -384,7 +384,7 @@ static void process_event(union perf_event *event __unused, ...@@ -384,7 +384,7 @@ static void process_event(union perf_event *event __unused,
printf(" "); printf(" ");
else else
printf("\n"); printf("\n");
perf_session__print_ip(event, sample, session, perf_session__print_ip(event, evsel, sample, session,
PRINT_FIELD(SYM), PRINT_FIELD(DSO)); PRINT_FIELD(SYM), PRINT_FIELD(DSO));
} }
......
...@@ -777,7 +777,7 @@ static void perf_event__process_sample(const union perf_event *event, ...@@ -777,7 +777,7 @@ static void perf_event__process_sample(const union perf_event *event,
if ((sort__has_parent || symbol_conf.use_callchain) && if ((sort__has_parent || symbol_conf.use_callchain) &&
sample->callchain) { sample->callchain) {
err = perf_session__resolve_callchain(session, al.thread, err = perf_session__resolve_callchain(session, evsel, al.thread,
sample->callchain, &parent); sample->callchain, &parent);
if (err) if (err)
return; return;
...@@ -790,7 +790,7 @@ static void perf_event__process_sample(const union perf_event *event, ...@@ -790,7 +790,7 @@ static void perf_event__process_sample(const union perf_event *event,
} }
if (symbol_conf.use_callchain) { if (symbol_conf.use_callchain) {
err = callchain_append(he->callchain, &session->callchain_cursor, err = callchain_append(he->callchain, &evsel->hists.callchain_cursor,
sample->period); sample->period);
if (err) if (err)
return; return;
......
...@@ -216,7 +216,7 @@ static bool symbol__match_parent_regex(struct symbol *sym) ...@@ -216,7 +216,7 @@ static bool symbol__match_parent_regex(struct symbol *sym)
return 0; 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 thread *thread,
struct ip_callchain *chain, struct ip_callchain *chain,
struct symbol **parent) struct symbol **parent)
...@@ -225,7 +225,7 @@ int perf_session__resolve_callchain(struct perf_session *self, ...@@ -225,7 +225,7 @@ int perf_session__resolve_callchain(struct perf_session *self,
unsigned int i; unsigned int i;
int err; int err;
callchain_cursor_reset(&self->callchain_cursor); callchain_cursor_reset(&evsel->hists.callchain_cursor);
for (i = 0; i < chain->nr; i++) { for (i = 0; i < chain->nr; i++) {
u64 ip; u64 ip;
...@@ -261,7 +261,7 @@ int perf_session__resolve_callchain(struct perf_session *self, ...@@ -261,7 +261,7 @@ int perf_session__resolve_callchain(struct perf_session *self,
break; break;
} }
err = callchain_cursor_append(&self->callchain_cursor, err = callchain_cursor_append(&evsel->hists.callchain_cursor,
ip, al.map, al.sym); ip, al.map, al.sym);
if (err) if (err)
return err; return err;
...@@ -1254,14 +1254,14 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, ...@@ -1254,14 +1254,14 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
return NULL; 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_sample *sample,
struct perf_session *session, struct perf_session *session,
int print_sym, int print_dso) int print_sym, int print_dso)
{ {
struct addr_location al; struct addr_location al;
const char *symname, *dsoname; const char *symname, *dsoname;
struct callchain_cursor *cursor = &session->callchain_cursor; struct callchain_cursor *cursor = &evsel->hists.callchain_cursor;
struct callchain_cursor_node *node; struct callchain_cursor_node *node;
if (perf_event__preprocess_sample(event, session, &al, sample, if (perf_event__preprocess_sample(event, session, &al, sample,
...@@ -1273,7 +1273,7 @@ void perf_session__print_ip(union perf_event *event, ...@@ -1273,7 +1273,7 @@ void perf_session__print_ip(union perf_event *event,
if (symbol_conf.use_callchain && sample->callchain) { 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) { sample->callchain, NULL) != 0) {
if (verbose) if (verbose)
error("Failed to resolve callchain. Skipping\n"); error("Failed to resolve callchain. Skipping\n");
......
...@@ -50,7 +50,6 @@ struct perf_session { ...@@ -50,7 +50,6 @@ struct perf_session {
int cwdlen; int cwdlen;
char *cwd; char *cwd;
struct ordered_samples ordered_samples; struct ordered_samples ordered_samples;
struct callchain_cursor callchain_cursor;
char filename[0]; char filename[0];
}; };
...@@ -100,7 +99,7 @@ int __perf_session__process_events(struct perf_session *self, ...@@ -100,7 +99,7 @@ int __perf_session__process_events(struct perf_session *self,
int perf_session__process_events(struct perf_session *self, int perf_session__process_events(struct perf_session *self,
struct perf_event_ops *event_ops); 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 thread *thread,
struct ip_callchain *chain, struct ip_callchain *chain,
struct symbol **parent); struct symbol **parent);
...@@ -169,7 +168,7 @@ static inline int perf_session__parse_sample(struct perf_session *session, ...@@ -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, struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
unsigned int type); 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_sample *sample,
struct perf_session *session, struct perf_session *session,
int print_sym, int print_dso); int print_sym, int print_dso);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册