AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf evsel: Rename perf_evsel__resort*() to evsel__resort*()

Browse Source 
As it is a 'struct evsel' method, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2020-05-06 12:58:55 -03:00
parent 4c70382824
commit 10c513f798
8 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-annotate.c
View File

@ -432,7 +432,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
/* Don't sort callchain */ /* Don't sort callchain */
evsel__reset_sample_bit(pos, CALLCHAIN); evsel__reset_sample_bit(pos, CALLCHAIN);
perf_evsel__output_resort(pos, NULL); evsel__output_resort(pos, NULL);
if (symbol_conf.event_group && !evsel__is_group_leader(pos)) if (symbol_conf.event_group && !evsel__is_group_leader(pos))
continue; continue;

3
tools/perf/builtin-report.c
View File

@ -716,8 +716,7 @@ static void report__output_resort(struct report *rep)
ui_progress__init(&prog, rep->nr_entries, "Sorting events for output..."); ui_progress__init(&prog, rep->nr_entries, "Sorting events for output...");
evlist__for_each_entry(rep->session->evlist, pos) { evlist__for_each_entry(rep->session->evlist, pos) {
perf_evsel__output_resort_cb(pos, &prog, evsel__output_resort_cb(pos, &prog, hists__resort_cb, rep);
hists__resort_cb, rep);
} }
ui_progress__finish(); ui_progress__finish();

2
tools/perf/builtin-top.c
View File

@ -307,7 +307,7 @@ static void perf_top__resort_hists(struct perf_top *t)
} }
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
perf_evsel__output_resort(pos, NULL); evsel__output_resort(pos, NULL);
} }
} }

2
tools/perf/tests/hists_cumulate.c
View File

@ -190,7 +190,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. * function since TEST_ASSERT_VAL() returns in case of failure.
*/ */
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(hists_to_evsel(hists), NULL); evsel__output_resort(hists_to_evsel(hists), NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("use callchain: %d, cumulate callchain: %d\n", pr_info("use callchain: %d, cumulate callchain: %d\n",

2
tools/perf/tests/hists_filter.c
View File

@ -142,7 +142,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu
struct hists *hists = evsel__hists(evsel); struct hists *hists = evsel__hists(evsel);
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(evsel, NULL); evsel__output_resort(evsel, NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("Normal histogram\n"); pr_info("Normal histogram\n");

10
tools/perf/tests/hists_output.c
View File

@ -155,7 +155,7 @@ static int test1(struct evsel *evsel, struct machine *machine)
goto out; goto out;
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(evsel, NULL); evsel__output_resort(evsel, NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order); pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@ -255,7 +255,7 @@ static int test2(struct evsel *evsel, struct machine *machine)
goto out; goto out;
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(evsel, NULL); evsel__output_resort(evsel, NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order); pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@ -309,7 +309,7 @@ static int test3(struct evsel *evsel, struct machine *machine)
goto out; goto out;
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(evsel, NULL); evsel__output_resort(evsel, NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order); pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@ -387,7 +387,7 @@ static int test4(struct evsel *evsel, struct machine *machine)
goto out; goto out;
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(evsel, NULL); evsel__output_resort(evsel, NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order); pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);
@ -490,7 +490,7 @@ static int test5(struct evsel *evsel, struct machine *machine)
goto out; goto out;
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
perf_evsel__output_resort(evsel, NULL); evsel__output_resort(evsel, NULL);
if (verbose > 2) { if (verbose > 2) {
pr_info("[fields = %s, sort = %s]\n", field_order, sort_order); pr_info("[fields = %s, sort = %s]\n", field_order, sort_order);

8
tools/perf/util/hist.c
View File

@ -1930,8 +1930,8 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,
} }
} }
void perf_evsel__output_resort_cb(struct evsel *evsel, struct ui_progress *prog, void evsel__output_resort_cb(struct evsel *evsel, struct ui_progress *prog,
hists__resort_cb_t cb, void *cb_arg) hists__resort_cb_t cb, void *cb_arg)
{ {
bool use_callchain; bool use_callchain;
@ -1945,9 +1945,9 @@ void perf_evsel__output_resort_cb(struct evsel *evsel, struct ui_progress *prog,
output_resort(evsel__hists(evsel), prog, use_callchain, cb, cb_arg); output_resort(evsel__hists(evsel), prog, use_callchain, cb, cb_arg);
} }
void perf_evsel__output_resort(struct evsel *evsel, struct ui_progress *prog) void evsel__output_resort(struct evsel *evsel, struct ui_progress *prog)
{ {
return perf_evsel__output_resort_cb(evsel, prog, NULL, NULL); return evsel__output_resort_cb(evsel, prog, NULL, NULL);
} }
void hists__output_resort(struct hists *hists, struct ui_progress *prog) void hists__output_resort(struct hists *hists, struct ui_progress *prog)

6
tools/perf/util/hist.h
View File

@ -173,9 +173,9 @@ void hist_entry__delete(struct hist_entry *he);
typedef int (*hists__resort_cb_t)(struct hist_entry *he, void *arg); typedef int (*hists__resort_cb_t)(struct hist_entry *he, void *arg);
void perf_evsel__output_resort_cb(struct evsel *evsel, struct ui_progress *prog, void evsel__output_resort_cb(struct evsel *evsel, struct ui_progress *prog,
hists__resort_cb_t cb, void *cb_arg); hists__resort_cb_t cb, void *cb_arg);
void perf_evsel__output_resort(struct evsel *evsel, struct ui_progress *prog); void evsel__output_resort(struct evsel *evsel, struct ui_progress *prog);
void hists__output_resort(struct hists *hists, 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, void hists__output_resort_cb(struct hists *hists, struct ui_progress *prog,
hists__resort_cb_t cb); hists__resort_cb_t cb);