perf tools: Move ipc_symbol computation to resort
Jiri Olsa
reviewercover perf tools: Move ipc_symbol computation to resort
hi,
currently the we make annotation for ipc column during the entry display, already outside the progress bar scope, so it appears like perf report is stuck.
You can see that on following example (with perf.data big enough):
$ perf record -b ...
$ perf report -s symbolThe report TUI code will appear stuck when scrolling down, because annotation are computed at that time. For --stdio, the output will be displayed noticeably more slowly, than with the fix.
There's no functional change, I'm just moving the annotation retrieval to the resort phase, so all the data are ready for display.
thanks,
jirka
---
Jiri Olsa (3):
perf tools: Add argument to hists__resort_cb_t callback perf tools: Add perf_evsel__output_resort_cb function perf tools: Move symbol annotation to resort
tools/perf/builtin-c2c.c | 8 ++++---- tools/perf/builtin-report.c | 21 +++++++++++++++++++-- tools/perf/util/hist.c | 19 +++++++++++++------ tools/perf/util/hist.h | 4 +++- tools/perf/util/sort.c | 7 ------- 5 files changed, 39 insertions(+), 20 deletions(-)
Jiri Olsa
reviewerPATCH 1/3 perf tools: Add argument to hists__resort_cb_t callback
Adding argument to hists__resort_cb_t so we could pass data from upper layers to callback function. It will be used in following patches.
--- tools/perf/builtin-c2c.c | 8 ++++---- tools/perf/util/hist.c | 11 ++++++----- tools/perf/util/hist.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-)
tools/perf/builtin-c2c.c +4 -4
@@ -1970,7 +1970,7 @@ static void calc_width(struct c2c_hist_entry *c2c_he)set_nodestr (c2c_he); } -static int filter_cb (struct hist_entry *he) +static int filter_cb (struct hist_entry *he,void *arg__maybe_unused ) {struct c2c_hist_entry *c2c_he;
@@ -1987,7 +1987,7 @@ static int filter_cb(struct hist_entry *he)return 0 ; } -static int resort_cl_cb (struct hist_entry *he) +static int resort_cl_cb (struct hist_entry *he,void *arg__maybe_unused ) {struct c2c_hist_entry *c2c_he;struct c2c_hists *c2c_hists;
@@ -2074,7 +2074,7 @@ static int setup_nodes(struct perf_session *session)#define HAS_HITMS (__h) ((__h)->stats.lcl_hitm || (__h)->stats.rmt_hitm) -static int resort_hitm_cb (struct hist_entry *he) +static int resort_hitm_cb (struct hist_entry *he,void *arg__maybe_unused ) {struct c2c_hist_entry *c2c_he; c2c_he = container_of(he, struct c2c_hist_entry, he);
@@ -2096,7 +2096,7 @@ static int hists__iterate_cb(struct hists *hists, hists__resort_cb_t cb)struct hist_entry *he; he = rb_entry(next, struct hist_entry, rb_node); - ret =cb (he); + ret =cb (he,NULL );if (ret)break ; next =rb_next (&he->rb_node);
tools/perf/util/hist.c +6 -5
@@ -1721,7 +1721,8 @@ static void __hists__insert_output_entry(struct rb_root_cached *entries, }static void output_resort (struct hists *hists,struct ui_progress *prog, -bool use_callchain,hists__resort_cb_t cb) +bool use_callchain,hists__resort_cb_t cb, +void *cb_arg) {struct rb_root_cached *root;struct rb_node *next;
@@ -1760,7 +1761,7 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, n = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&n->rb_node_in); -if (cb &&cb (n)) +if (cb &&cb (n, cb_arg))continue ;__hists__insert_output_entry (&hists->entries, n, min_callchain_hits, use_callchain);
@@ -1785,18 +1786,18 @@ void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *pro use_callchain |= symbol_conf.show_branchflag_count; -output_resort (evsel__hists (evsel), prog, use_callchain,NULL ); +output_resort (evsel__hists (evsel), prog, use_callchain,NULL ,NULL ); }void hists__output_resort (struct hists *hists,struct ui_progress *prog) { -output_resort (hists, prog, symbol_conf.use_callchain,NULL ); +output_resort (hists, prog, symbol_conf.use_callchain,NULL ,NULL ); }void hists__output_resort_cb (struct hists *hists,struct ui_progress *prog,hists__resort_cb_t cb) { -output_resort (hists, prog, symbol_conf.use_callchain, cb); +output_resort (hists, prog, symbol_conf.use_callchain, cb,NULL ); }static bool can_goto_child (struct hist_entry *he,enum hierarchy_move_dir hmd)
tools/perf/util/hist.h +1 -1
@@ -163,7 +163,7 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp, struct perf_hpp_fmt *fmt, int printed);void hist_entry__delete (struct hist_entry *he); -typedef int (*hists__resort_cb_t )(struct hist_entry *he); +typedef int (*hists__resort_cb_t )(struct hist_entry *he,void *arg);void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog);void hists__output_resort (struct hists *hists,struct ui_progress *prog);
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH 2/3 perf tools: Add perf_evsel__output_resort_cb function
In reply to Jiri OlsaAdding perf_evsel__output_resort_cb so we have an interface with callback on each hist entry. It will be used in following patch.
--- tools/perf/util/hist.c | 10 ++++++++-- tools/perf/util/hist.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +8 -2
@@ -1775,7 +1775,8 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, } } -void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog) +void perf_evsel__output_resort_cb (struct perf_evsel *evsel,struct ui_progress *prog, +hists__resort_cb_t cb,void *cb_arg) {bool use_callchain;
@@ -1786,7 +1787,12 @@ void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *pro use_callchain |= symbol_conf.show_branchflag_count; -output_resort (evsel__hists (evsel), prog, use_callchain,NULL ,NULL ); +output_resort (evsel__hists (evsel), prog, use_callchain, cb, cb_arg); +} + +void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog) +{ +return perf_evsel__output_resort_cb (evsel, prog,NULL ,NULL ); }void hists__output_resort (struct hists *hists,struct ui_progress *prog)
tools/perf/util/hist.h +2 -0
@@ -165,6 +165,8 @@ void hist_entry__delete(struct hist_entry *he);typedef int (*hists__resort_cb_t )(struct hist_entry *he,void *arg); +void perf_evsel__output_resort_cb (struct perf_evsel *evsel,struct ui_progress *prog, +hists__resort_cb_t cb,void *cb_arg);void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog);void hists__output_resort (struct hists *hists,struct ui_progress *prog); void hists__output_resort_cb(struct hists *hists, struct ui_progress *prog,
Signature · 1 line
2.17.2
Jiri Olsa
reviewerPATCH 3/3 perf tools: Move symbol annotation to resort
In reply to Jiri OlsaCurrently the we make annotation for ipc column during the entry display, already outside the progress bar scope, so it appears like perf report is stuck.
Moving the annotation retrieval to the resort phase, so all the data are ready for display.
--- tools/perf/builtin-report.c | 21 +++++++++++++++++++-- tools/perf/util/sort.c | 7 ------- 2 files changed, 19 insertions(+), 9 deletions(-)
tools/perf/builtin-report.c +19 -2
@@ -616,6 +616,21 @@ static int report__collapse_hists(struct report *rep)return ret; } +static int hists__resort_cb (struct hist_entry *he,void *arg) +{ +struct report *rep = arg; +struct symbol *sym = he->ms.sym; + +if (rep->symbol_ipc && sym && !sym->annotate2) { +struct perf_evsel *evsel =hists_to_evsel (he->hists); + +symbol__annotate2 (sym, he->ms.map, evsel, + &annotation__default_options,NULL ); + } + +return 0 ; +} +static void report__output_resort (struct report *rep) {struct ui_progress prog;
@@ -623,8 +638,10 @@ static void report__output_resort(struct report *rep)ui_progress__init (&prog, rep->nr_entries,"Sorting events for output..." ); -evlist__for_each_entry (rep->session->evlist, pos) -perf_evsel__output_resort (pos, &prog); +evlist__for_each_entry (rep->session->evlist, pos) { +perf_evsel__output_resort_cb (pos, &prog, + hists__resort_cb, rep); + }ui_progress__finish (); }
tools/perf/util/sort.c +0 -7
@@ -429,8 +429,6 @@ static int hist_entry__sym_ipc_snprintf(struct hist_entry *he, char *bf, {struct symbol *sym = he->ms.sym; -struct map *map = he->ms.map; -struct perf_evsel *evsel =hists_to_evsel (he->hists);struct annotation *notes;double ipc =0.0 , coverage =0.0 ;char tmp[64 ];
@@ -438,11 +436,6 @@ static int hist_entry__sym_ipc_snprintf(struct hist_entry *he, char *bf,if (!sym)return repsep_snprintf (bf, size,"%-*s" , width,"-" ); -if (!sym->annotate2 &&symbol__annotate2 (sym, map, evsel, - &annotation__default_options,NULL ) <0 ) { -return 0 ; - } - notes =symbol__annotation (sym);if (notes->hit_cycles)
Signature · 1 line
2.17.2
Em Mon, Feb 04, 2019 at 03:18:05PM +0100, Jiri Olsa escreveu:
Quoted 9 lines
hi,
currently the we make annotation for ipc column during the entry display, already outside the progress bar scope, so it appears like perf report is stuck.You can see that on following example (with perf.data big enough):
$ perf record -b ... $ perf report -s symbol
Quoted 7 lines
The report TUI code will appear stuck when scrolling down, because annotation are computed at that time. For --stdio, the output will be displayed noticeably more slowly, than with the fix.
There's no functional change, I'm just moving the annotation retrieval to the resort phase, so all the data are ready for
Thanks, applied.
- Arnaldo
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf hists: Add argument to hists__resort_cb_t callback
In reply to Jiri Olsaperf hists: Add argument to hists__resort_cb_t callback
Commit-ID: e4c38fd4a0f594d8ce0313db028af98b36edc8b3 Gitweb: https://git.kernel.org/tip/e4c38fd4a0f594d8ce0313db028af98b36edc8b3 Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 4 Feb 2019 15:18:06 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:00:39 -0300
perf hists: Add argument to hists__resort_cb_t callback
Add argument to hists__resort_cb_t so that we can pass data from upper layers to the callback function. It will be used in the following patches.
--- tools/perf/builtin-c2c.c | 8 ++++---- tools/perf/util/hist.c | 11 ++++++----- tools/perf/util/hist.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-)
tools/perf/builtin-c2c.c +4 -4
@@ -1970,7 +1970,7 @@ static void calc_width(struct c2c_hist_entry *c2c_he)set_nodestr (c2c_he); } -static int filter_cb (struct hist_entry *he) +static int filter_cb (struct hist_entry *he,void *arg__maybe_unused ) {struct c2c_hist_entry *c2c_he;
@@ -1987,7 +1987,7 @@ static int filter_cb(struct hist_entry *he)return 0 ; } -static int resort_cl_cb (struct hist_entry *he) +static int resort_cl_cb (struct hist_entry *he,void *arg__maybe_unused ) {struct c2c_hist_entry *c2c_he;struct c2c_hists *c2c_hists;
@@ -2074,7 +2074,7 @@ static int setup_nodes(struct perf_session *session)#define HAS_HITMS (__h) ((__h)->stats.lcl_hitm || (__h)->stats.rmt_hitm) -static int resort_hitm_cb (struct hist_entry *he) +static int resort_hitm_cb (struct hist_entry *he,void *arg__maybe_unused ) {struct c2c_hist_entry *c2c_he; c2c_he = container_of(he, struct c2c_hist_entry, he);
@@ -2096,7 +2096,7 @@ static int hists__iterate_cb(struct hists *hists, hists__resort_cb_t cb)struct hist_entry *he; he = rb_entry(next, struct hist_entry, rb_node); - ret =cb (he); + ret =cb (he,NULL );if (ret)break ; next =rb_next (&he->rb_node);
tools/perf/util/hist.c +6 -5
@@ -1721,7 +1721,8 @@ static void __hists__insert_output_entry(struct rb_root_cached *entries, }static void output_resort (struct hists *hists,struct ui_progress *prog, -bool use_callchain,hists__resort_cb_t cb) +bool use_callchain,hists__resort_cb_t cb, +void *cb_arg) {struct rb_root_cached *root;struct rb_node *next;
@@ -1760,7 +1761,7 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, n = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&n->rb_node_in); -if (cb &&cb (n)) +if (cb &&cb (n, cb_arg))continue ;__hists__insert_output_entry (&hists->entries, n, min_callchain_hits, use_callchain);
@@ -1785,18 +1786,18 @@ void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *pro use_callchain |= symbol_conf.show_branchflag_count; -output_resort (evsel__hists (evsel), prog, use_callchain,NULL ); +output_resort (evsel__hists (evsel), prog, use_callchain,NULL ,NULL ); }void hists__output_resort (struct hists *hists,struct ui_progress *prog) { -output_resort (hists, prog, symbol_conf.use_callchain,NULL ); +output_resort (hists, prog, symbol_conf.use_callchain,NULL ,NULL ); }void hists__output_resort_cb (struct hists *hists,struct ui_progress *prog,hists__resort_cb_t cb) { -output_resort (hists, prog, symbol_conf.use_callchain, cb); +output_resort (hists, prog, symbol_conf.use_callchain, cb,NULL ); }static bool can_goto_child (struct hist_entry *he,enum hierarchy_move_dir hmd)
tools/perf/util/hist.h +1 -1
@@ -163,7 +163,7 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp, struct perf_hpp_fmt *fmt, int printed);void hist_entry__delete (struct hist_entry *he); -typedef int (*hists__resort_cb_t )(struct hist_entry *he); +typedef int (*hists__resort_cb_t )(struct hist_entry *he,void *arg);void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog);void hists__output_resort (struct hists *hists,struct ui_progress *prog);
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf evsel: Add output_resort_cb method
In reply to Jiri Olsaperf evsel: Add output_resort_cb method
Commit-ID: 5749618764c2dbbb0091035d84dd763529afe4e6 Gitweb: https://git.kernel.org/tip/5749618764c2dbbb0091035d84dd763529afe4e6 Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 4 Feb 2019 15:18:07 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:00:40 -0300
perf evsel: Add output_resort_cb method
Add perf_evsel__output_resort_cb() so we have an interface with a callback for each hist entry. It will be used in the following patch.
--- tools/perf/util/hist.c | 10 ++++++++-- tools/perf/util/hist.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +8 -2
@@ -1775,7 +1775,8 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, } } -void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog) +void perf_evsel__output_resort_cb (struct perf_evsel *evsel,struct ui_progress *prog, +hists__resort_cb_t cb,void *cb_arg) {bool use_callchain;
@@ -1786,7 +1787,12 @@ void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *pro use_callchain |= symbol_conf.show_branchflag_count; -output_resort (evsel__hists (evsel), prog, use_callchain,NULL ,NULL ); +output_resort (evsel__hists (evsel), prog, use_callchain, cb, cb_arg); +} + +void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog) +{ +return perf_evsel__output_resort_cb (evsel, prog,NULL ,NULL ); }void hists__output_resort (struct hists *hists,struct ui_progress *prog)
tools/perf/util/hist.h +2 -0
@@ -165,6 +165,8 @@ void hist_entry__delete(struct hist_entry *he);typedef int (*hists__resort_cb_t )(struct hist_entry *he,void *arg); +void perf_evsel__output_resort_cb (struct perf_evsel *evsel,struct ui_progress *prog, +hists__resort_cb_t cb,void *cb_arg);void perf_evsel__output_resort (struct perf_evsel *evsel,struct ui_progress *prog);void hists__output_resort (struct hists *hists,struct ui_progress *prog); void hists__output_resort_cb(struct hists *hists, struct ui_progress *prog,
tip-bot for Jiri Olsa
merge bot[tip:perf/core] perf report: Move symbol annotation to the resort phase
In reply to Jiri Olsaperf report: Move symbol annotation to the resort phase
Commit-ID: dbd2a1d57f4ee6b909c94072ae9484199308acbd Gitweb: https://git.kernel.org/tip/dbd2a1d57f4ee6b909c94072ae9484199308acbd Author: Jiri Olsa <[email protected]> AuthorDate: Mon, 4 Feb 2019 15:18:08 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:00:40 -0300
perf report: Move symbol annotation to the resort phase
Currently we make the annotation for the IPC column during the entry display, already outside of the progress bar scope, so it appears like 'perf report' is stuck.
Move the annotation retrieval to the resort phase, so that all the data are ready for display.
--- tools/perf/builtin-report.c | 21 +++++++++++++++++++-- tools/perf/util/sort.c | 7 ------- 2 files changed, 19 insertions(+), 9 deletions(-)
tools/perf/builtin-report.c +19 -2
@@ -616,6 +616,21 @@ static int report__collapse_hists(struct report *rep)return ret; } +static int hists__resort_cb (struct hist_entry *he,void *arg) +{ +struct report *rep = arg; +struct symbol *sym = he->ms.sym; + +if (rep->symbol_ipc && sym && !sym->annotate2) { +struct perf_evsel *evsel =hists_to_evsel (he->hists); + +symbol__annotate2 (sym, he->ms.map, evsel, + &annotation__default_options,NULL ); + } + +return 0 ; +} +static void report__output_resort (struct report *rep) {struct ui_progress prog;
@@ -623,8 +638,10 @@ static void report__output_resort(struct report *rep)ui_progress__init (&prog, rep->nr_entries,"Sorting events for output..." ); -evlist__for_each_entry (rep->session->evlist, pos) -perf_evsel__output_resort (pos, &prog); +evlist__for_each_entry (rep->session->evlist, pos) { +perf_evsel__output_resort_cb (pos, &prog, + hists__resort_cb, rep); + }ui_progress__finish (); }
tools/perf/util/sort.c +0 -7
@@ -429,8 +429,6 @@ static int hist_entry__sym_ipc_snprintf(struct hist_entry *he, char *bf, {struct symbol *sym = he->ms.sym; -struct map *map = he->ms.map; -struct perf_evsel *evsel =hists_to_evsel (he->hists);struct annotation *notes;double ipc =0.0 , coverage =0.0 ;char tmp[64 ];
@@ -438,11 +436,6 @@ static int hist_entry__sym_ipc_snprintf(struct hist_entry *he, char *bf,if (!sym)return repsep_snprintf (bf, size,"%-*s" , width,"-" ); -if (!sym->annotate2 &&symbol__annotate2 (sym, map, evsel, - &annotation__default_options,NULL ) <0 ) { -return 0 ; - } - notes =symbol__annotation (sym);if (notes->hit_cycles)