Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1325632
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 01/29] perf hists: Factor output_resort from hists__output_resort |
| Date | 2016-02-03 17:40 +0100 |
| Message-ID | <qY8Dh-4ol-21@gated-at.bofh.it> (permalink) |
| References | <qY8Dg-4ol-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
See http://www.infradead.org/rpr.html
From: Jiri Olsa <jolsa@kernel.org>
Currently hists__output_resort() depends on hists based on hists_evsel
struct, but we need to be able to sort common hists as well.
Cutting out the sorting base sorting code into output_resort
function, so it can be reused in following patch.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-2-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/hist.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 098310bc4489..7797d06d4993 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1197,19 +1197,13 @@ static void __hists__insert_output_entry(struct rb_root *entries,
rb_insert_color(&he->rb_node, entries);
}
-void hists__output_resort(struct hists *hists, struct ui_progress *prog)
+static void output_resort(struct hists *hists, struct ui_progress *prog,
+ bool use_callchain)
{
struct rb_root *root;
struct rb_node *next;
struct hist_entry *n;
u64 min_callchain_hits;
- struct perf_evsel *evsel = hists_to_evsel(hists);
- bool use_callchain;
-
- if (evsel && symbol_conf.use_callchain && !symbol_conf.show_ref_callgraph)
- use_callchain = evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN;
- else
- use_callchain = symbol_conf.use_callchain;
min_callchain_hits = hists__total_period(hists) * (callchain_param.min_percent / 100);
@@ -1239,6 +1233,19 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog)
}
}
+void hists__output_resort(struct hists *hists, struct ui_progress *prog)
+{
+ struct perf_evsel *evsel = hists_to_evsel(hists);
+ bool use_callchain;
+
+ if (evsel && symbol_conf.use_callchain && !symbol_conf.show_ref_callgraph)
+ use_callchain = evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN;
+ else
+ use_callchain = symbol_conf.use_callchain;
+
+ output_resort(hists, prog, use_callchain);
+}
+
static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h,
enum hist_filter filter)
{
--
2.5.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 00/29] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 25/29] perf hists: Introduce hists__for_each_format macro Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 01/29] perf hists: Factor output_resort from hists__output_resort Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 03/29] perf hists: Add _idx fields into struct perf_hpp_fmt Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 26/29] perf hists: Introduce hists__for_each_sort_list macro Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 23/29] perf hists: Add struct perf_hpp_list argument to helper functions Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 27/29] perf report: Update documentation of --sort option Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 20/29] perf hists: Introduce perf_hpp_list__for_each_format_safe macro Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 22/29] perf hists: Introduce perf_hpp_list__for_each_sort_list_safe macro Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 14/29] perf hists: Separate output fields parsing into setup_output_list function Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 02/29] perf hists: Introduce perf_evsel__output_resort function Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:40 +0100 [PATCH 07/29] perf hists: Make hpp setup function generic Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 15/29] perf hists: Introduce struct perf_hpp_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 17/29] perf hists: Add perf_hpp_list register helpers Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 19/29] perf hists: Introduce perf_hpp_list__for_each_format macro Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 13/29] perf hists: Separate sort fields parsing into setup_sort_list function Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 16/29] perf hists: Introduce perf_hpp_list__init function Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 24/29] perf tools: Add hpp_list into struct hists object Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 12/29] perf hists: Properly release format fields Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 10/29] perf hists: Allocate output sort field Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 08/29] perf report: Move UI initialization ahead of sort setup Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 06/29] perf hists: Add 'hpp__equal' callback function Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 21/29] perf hists: Introduce perf_hpp_list__for_each_sort_list macro Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 04/29] perf hists: Use struct perf_hpp_fmt::idx in perf_hpp__reset_width Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 11/29] perf hists: Remove perf_hpp__column_(disable|enable) Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 17:50 +0100 [PATCH 18/29] perf hists: Pass perf_hpp_list all the way through setup_output_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 18:00 +0100 [PATCH 28/29] perf report: Update documention of --percent-limit option Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 18:00 +0100 [PATCH 09/29] perf top: Move UI initialization ahead of sort setup Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 18:00 +0100 [PATCH 29/29] perf hists browser: Add 'L' hotkey to change percent limit Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-03 18:00 +0100 Re: [GIT PULL 00/29] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-02-04 09:00 +0100
csiph-web