From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 02/26] perf tools: Introduce perf_evsel__output_resort function
Date: Mon, 18 Jan 2016 10:24:00 +0100 [thread overview]
Message-ID: <1453109064-1026-3-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1453109064-1026-1-git-send-email-jolsa@kernel.org>
Adding evsel specific function to sort hists_evsel
based hists. The hists__output_resort can be now
used to sort common hists object.
Link: http://lkml.kernel.org/n/tip-5w6e9whw8iy5ve3szil9076y@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-annotate.c | 2 +-
tools/perf/builtin-report.c | 2 +-
tools/perf/builtin-top.c | 10 ++++++----
tools/perf/tests/hists_cumulate.c | 2 +-
tools/perf/tests/hists_filter.c | 2 +-
tools/perf/tests/hists_output.c | 10 +++++-----
tools/perf/util/hist.c | 10 +++++++---
tools/perf/util/hist.h | 1 +
8 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index cc5c1267c738..cfe366375c4b 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -245,7 +245,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
hists__collapse_resort(hists, NULL);
/* Don't sort callchain */
perf_evsel__reset_sample_bit(pos, CALLCHAIN);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(pos, NULL);
if (symbol_conf.event_group &&
!perf_evsel__is_group_leader(pos))
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 2bf537f190a0..2fe654dd8d2b 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -504,7 +504,7 @@ static void report__output_resort(struct report *rep)
ui_progress__init(&prog, rep->nr_entries, "Sorting events for output...");
evlist__for_each(rep->session->evlist, pos)
- hists__output_resort(evsel__hists(pos), &prog);
+ perf_evsel__output_resort(pos, &prog);
ui_progress__finish();
}
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index bf01cbb0ef23..f1bbe2a589f5 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -252,7 +252,8 @@ static void perf_top__print_sym_table(struct perf_top *top)
char bf[160];
int printed = 0;
const int win_width = top->winsize.ws_col - 1;
- struct hists *hists = evsel__hists(top->sym_evsel);
+ struct perf_evsel *evsel = top->sym_evsel;
+ struct hists *hists = evsel__hists(evsel);
puts(CONSOLE_CLEAR);
@@ -288,7 +289,7 @@ static void perf_top__print_sym_table(struct perf_top *top)
}
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
hists__output_recalc_col_len(hists, top->print_entries - printed);
putchar('\n');
@@ -540,6 +541,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
static void perf_top__sort_new_samples(void *arg)
{
struct perf_top *t = arg;
+ struct perf_evsel *evsel = t->sym_evsel;
struct hists *hists;
perf_top__reset_sample_counters(t);
@@ -547,7 +549,7 @@ static void perf_top__sort_new_samples(void *arg)
if (t->evlist->selected != NULL)
t->sym_evsel = t->evlist->selected;
- hists = evsel__hists(t->sym_evsel);
+ hists = evsel__hists(evsel);
if (t->evlist->enabled) {
if (t->zero) {
@@ -559,7 +561,7 @@ static void perf_top__sort_new_samples(void *arg)
}
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
}
static void *display_thread_tui(void *arg)
diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cumulate.c
index 5e6a86e50fb9..ecf136c385d5 100644
--- a/tools/perf/tests/hists_cumulate.c
+++ b/tools/perf/tests/hists_cumulate.c
@@ -191,7 +191,7 @@ static int do_test(struct hists *hists, struct result *expected, size_t nr_expec
* function since TEST_ASSERT_VAL() returns in case of failure.
*/
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(hists_to_evsel(hists), NULL);
if (verbose > 2) {
pr_info("use callchain: %d, cumulate callchain: %d\n",
diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 351a42463444..34b945a55d4d 100644
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -145,7 +145,7 @@ int test__hists_filter(int subtest __maybe_unused)
struct hists *hists = evsel__hists(evsel);
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
if (verbose > 2) {
pr_info("Normal histogram\n");
diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
index b231265148d8..23cce67c7e48 100644
--- a/tools/perf/tests/hists_output.c
+++ b/tools/perf/tests/hists_output.c
@@ -156,7 +156,7 @@ static int test1(struct perf_evsel *evsel, struct machine *machine)
goto out;
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@@ -256,7 +256,7 @@ static int test2(struct perf_evsel *evsel, struct machine *machine)
goto out;
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@@ -310,7 +310,7 @@ static int test3(struct perf_evsel *evsel, struct machine *machine)
goto out;
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@@ -388,7 +388,7 @@ static int test4(struct perf_evsel *evsel, struct machine *machine)
goto out;
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@@ -491,7 +491,7 @@ static int test5(struct perf_evsel *evsel, struct machine *machine)
goto out;
hists__collapse_resort(hists, NULL);
- hists__output_resort(hists, NULL);
+ perf_evsel__output_resort(evsel, NULL);
if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 83a6f2733cdc..a94067c8f753 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1215,9 +1215,8 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,
}
}
-void hists__output_resort(struct hists *hists, struct ui_progress *prog)
+void perf_evsel__output_resort(struct perf_evsel *evsel, 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)
@@ -1225,7 +1224,12 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog)
else
use_callchain = symbol_conf.use_callchain;
- output_resort(hists, prog, use_callchain);
+ output_resort(evsel__hists(evsel), prog, use_callchain);
+}
+
+void hists__output_resort(struct hists *hists, struct ui_progress *prog)
+{
+ output_resort(hists, prog, symbol_conf.use_callchain);
}
static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h,
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index d4ec4822a103..bc2499794bef 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -128,6 +128,7 @@ int hist_entry__sort_snprintf(struct hist_entry *he, char *bf, size_t size,
struct hists *hists);
void hist_entry__delete(struct hist_entry *he);
+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__collapse_resort(struct hists *hists, struct ui_progress *prog);
--
2.4.3
next prev parent reply other threads:[~2016-01-18 9:24 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-18 9:23 [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa
2016-01-18 9:23 ` [PATCH 01/26] perf tools: Factor output_resort from hists__output_resort Jiri Olsa
2016-02-04 12:33 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` Jiri Olsa [this message]
2016-02-04 12:33 ` [tip:perf/core] perf hists: Introduce perf_evsel__output_resort function tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 03/26] perf tools: Add _idx fields into struct perf_hpp_fmt Jiri Olsa
2016-02-04 12:34 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 04/26] perf tools: Use struct perf_hpp_fmt::idx in perf_hpp__reset_width Jiri Olsa
2016-02-04 12:34 ` [tip:perf/core] perf hists: Use struct perf_hpp_fmt:: idx " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 05/26] perf tools: Add equal method to perf_hpp_fmt struct Jiri Olsa
2016-02-04 12:34 ` [tip:perf/core] perf hists: Add 'equal' " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 06/26] perf tools: Add hpp__equal callback function Jiri Olsa
2016-02-04 12:35 ` [tip:perf/core] perf hists: Add 'hpp__equal' " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 07/26] perf tools: Make hpp setup function generic Jiri Olsa
2016-02-04 12:35 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 08/26] perf report: Move ui initialization ahead of sort setup Jiri Olsa
2016-02-04 12:35 ` [tip:perf/core] perf report: Move UI " tip-bot for Jiri Olsa
2016-02-04 12:36 ` [tip:perf/core] perf top: " tip-bot for Arnaldo Carvalho de Melo
2016-01-18 9:24 ` [PATCH 09/26] perf tools: Allocate output sort field Jiri Olsa
2016-02-04 12:36 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 10/26] perf tools: Remove perf_hpp__column_(disable|enable) Jiri Olsa
2016-02-04 12:36 ` [tip:perf/core] perf hists: Remove perf_hpp__column_( disable|enable) tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 11/26] perf tools: Properly release format fields Jiri Olsa
2016-02-04 12:37 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 12/26] perf tools: Separate sort fields parsing into setup_sort_list function Jiri Olsa
2016-02-04 12:37 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 13/26] perf tools: Separate output fields parsing into setup_output_list function Jiri Olsa
2016-02-04 12:37 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Jiri Olsa
2016-01-25 15:00 ` Namhyung Kim
2016-01-25 15:09 ` Jiri Olsa
2016-02-02 21:19 ` Arnaldo Carvalho de Melo
2016-02-04 12:38 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 15/26] perf tools: Introduce perf_hpp_list__init function Jiri Olsa
2016-02-04 12:38 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 16/26] perf tools: Add perf_hpp_list register helpers Jiri Olsa
2016-02-04 12:38 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 17/26] perf tools: Pass perf_hpp_list all the way through setup_sort_list Jiri Olsa
2016-03-06 19:21 ` [PATCHv2] " Jiri Olsa
2016-03-07 14:31 ` Arnaldo Carvalho de Melo
2016-03-09 10:04 ` [PATCHv3] " Jiri Olsa
2016-03-09 12:47 ` Namhyung Kim
2016-03-09 13:38 ` Arnaldo Carvalho de Melo
2016-03-11 8:46 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 18/26] perf tools: Pass perf_hpp_list all the way through setup_output_list Jiri Olsa
2016-02-04 12:39 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 19/26] perf tools: Introduce perf_hpp_list__for_each_format macro Jiri Olsa
2016-02-04 12:39 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 20/26] perf tools: Introduce perf_hpp_list__for_each_format_safe macro Jiri Olsa
2016-02-04 12:40 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 21/26] perf tools: Introduce perf_hpp_list__for_each_sort_list macro Jiri Olsa
2016-02-04 12:40 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 22/26] perf tools: Introduce perf_hpp_list__for_each_sort_list_safe macro Jiri Olsa
2016-02-04 12:40 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 23/26] perf tools: Add struct perf_hpp_list argument to helper functions Jiri Olsa
2016-02-04 12:41 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 24/26] perf tools: Add hpp_list into struct hists object Jiri Olsa
2016-02-04 12:41 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 25/26] perf tools: Introduce hists__for_each_format macro Jiri Olsa
2016-02-04 12:41 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 26/26] perf tools: Introduce hists__for_each_sort_list macro Jiri Olsa
2016-02-04 12:42 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-19 12:58 ` [RFC 00/26] perf tools: Introduce hists specific format entries Namhyung Kim
2016-01-19 13:23 ` Jiri Olsa
2016-01-25 7:15 ` Jiri Olsa
2016-01-25 14:24 ` Namhyung Kim
2016-01-25 14:37 ` Jiri Olsa
2016-02-02 22:22 ` Arnaldo Carvalho de Melo
2016-02-02 22:25 ` Arnaldo Carvalho de Melo
2016-02-02 22:42 ` Arnaldo Carvalho de Melo
2016-02-03 7:58 ` Jiri Olsa
2016-02-03 11:02 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453109064-1026-3-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome