[PATCH 02/21] perf tools: Add perf_sample__process function

Jiri Olsa
2018-01-24T11:57:17Z

Later we are going to process samples from another place
in the code. Factor out perf_sample__process function
for that purpose, that prepares iterator and calls the
hist_entry_iter__add function.

Link: http://lkml.kernel.org/n/tip-bh115ggpykl0wt8e7e3rolwn@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-report.c | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 697ccd2c68ca..9bae7f11691c 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -193,6 +193,31 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,
return err;
}

+static int
+perf_sample__process(struct perf_sample *sample, struct addr_location *al,
+ struct perf_evsel *evsel, struct report *rep)
+{
+ struct hist_entry_iter iter = {
+ .evsel = evsel,
+ .sample = sample,
+ .hide_unresolved = symbol_conf.hide_unresolved,
+ .add_entry_cb = hist_iter__report_callback,
+ };
+
+ if (sort__mode == SORT_MODE__BRANCH) {
+ iter.add_entry_cb = hist_iter__branch_callback;
+ iter.ops = &hist_iter_branch;
+ } else if (rep->mem_mode) {
+ iter.ops = &hist_iter_mem;
+ } else if (symbol_conf.cumulate_callchain) {
+ iter.ops = &hist_iter_cumulative;
+ } else {
+ iter.ops = &hist_iter_normal;
+ }
+
+ return hist_entry_iter__add(&iter, al, rep->max_stack, rep);
+}
+
static int process_sample_event(struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample,
@@ -201,12 +226,6 @@ static int process_sample_event(struct perf_tool *tool,
{
struct report *rep = container_of(tool, struct report, tool);
struct addr_location al;
- struct hist_entry_iter iter = {
- .evsel = evsel,
- .sample = sample,
- .hide_unresolved = symbol_conf.hide_unresolved,
- .add_entry_cb = hist_iter__report_callback,
- };
int ret = 0;

if (perf_time__ranges_skip_sample(rep->ptime_range, rep->range_num,
@@ -233,21 +252,12 @@ static int process_sample_event(struct perf_tool *tool,
*/
if (!sample->branch_stack)
goto out_put;
-
- iter.add_entry_cb = hist_iter__branch_callback;
- iter.ops = &hist_iter_branch;
- } else if (rep->mem_mode) {
- iter.ops = &hist_iter_mem;
- } else if (symbol_conf.cumulate_callchain) {
- iter.ops = &hist_iter_cumulative;
- } else {
- iter.ops = &hist_iter_normal;
}

if (al.map != NULL)
al.map->dso->hit = 1;

- ret = hist_entry_iter__add(&iter, &al, rep->max_stack, rep);
+ ret = perf_sample__process(sample, &al, evsel, rep);
if (ret < 0)
pr_debug("problem adding hist entry, skipping event\n");
out_put:
--
2.13.6