perf evlist: Use the right prefix for 'struct evlist' print methods

perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e414fd1a
...@@ -412,7 +412,7 @@ static int __cmd_annotate(struct perf_annotate *ann) ...@@ -412,7 +412,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
if (dump_trace) { if (dump_trace) {
perf_session__fprintf_nr_events(session, stdout); perf_session__fprintf_nr_events(session, stdout);
perf_evlist__fprintf_nr_events(session->evlist, stdout); evlist__fprintf_nr_events(session->evlist, stdout);
goto out; goto out;
} }
......
...@@ -928,7 +928,7 @@ static int __cmd_report(struct report *rep) ...@@ -928,7 +928,7 @@ static int __cmd_report(struct report *rep)
if (dump_trace) { if (dump_trace) {
perf_session__fprintf_nr_events(session, stdout); perf_session__fprintf_nr_events(session, stdout);
perf_evlist__fprintf_nr_events(session->evlist, stdout); evlist__fprintf_nr_events(session->evlist, stdout);
return 0; return 0;
} }
} }
......
...@@ -974,8 +974,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv) ...@@ -974,8 +974,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
if (stat_config.quiet) if (stat_config.quiet)
return; return;
perf_evlist__print_counters(evsel_list, &stat_config, &target, evlist__print_counters(evsel_list, &stat_config, &target, ts, argc, argv);
ts, argc, argv);
} }
static volatile int signr = -1; static volatile int signr = -1;
......
...@@ -2654,7 +2654,7 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al, ...@@ -2654,7 +2654,7 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al,
} }
} }
size_t perf_evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp) size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp)
{ {
struct evsel *pos; struct evsel *pos;
size_t ret = 0; size_t ret = 0;
......
...@@ -196,7 +196,7 @@ void hists__inc_nr_samples(struct hists *hists, bool filtered); ...@@ -196,7 +196,7 @@ void hists__inc_nr_samples(struct hists *hists, bool filtered);
size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
int max_cols, float min_pcnt, FILE *fp, int max_cols, float min_pcnt, FILE *fp,
bool ignore_callchains); bool ignore_callchains);
size_t perf_evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp); size_t evlist__fprintf_nr_events(struct evlist *evlist, FILE *fp);
void hists__filter_by_dso(struct hists *hists); void hists__filter_by_dso(struct hists *hists);
void hists__filter_by_thread(struct hists *hists); void hists__filter_by_thread(struct hists *hists);
......
...@@ -1191,9 +1191,7 @@ static void stack_user__printf(struct stack_dump *dump) ...@@ -1191,9 +1191,7 @@ static void stack_user__printf(struct stack_dump *dump)
dump->size, dump->offset); dump->size, dump->offset);
} }
static void perf_evlist__print_tstamp(struct evlist *evlist, static void evlist__print_tstamp(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
union perf_event *event,
struct perf_sample *sample)
{ {
u64 sample_type = __evlist__combined_sample_type(evlist); u64 sample_type = __evlist__combined_sample_type(evlist);
...@@ -1254,7 +1252,7 @@ static void dump_event(struct evlist *evlist, union perf_event *event, ...@@ -1254,7 +1252,7 @@ static void dump_event(struct evlist *evlist, union perf_event *event,
evlist->trace_event_sample_raw(evlist, event, sample); evlist->trace_event_sample_raw(evlist, event, sample);
if (sample) if (sample)
perf_evlist__print_tstamp(evlist, event, sample); evlist__print_tstamp(evlist, event, sample);
printf("%#" PRIx64 " [%#x]: PERF_RECORD_%s", file_offset, printf("%#" PRIx64 " [%#x]: PERF_RECORD_%s", file_offset,
event->header.size, perf_event__name(event->header.type)); event->header.size, perf_event__name(event->header.type));
......
...@@ -1184,12 +1184,8 @@ static void print_percore(struct perf_stat_config *config, ...@@ -1184,12 +1184,8 @@ static void print_percore(struct perf_stat_config *config,
fputc('\n', output); fputc('\n', output);
} }
void void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *config,
perf_evlist__print_counters(struct evlist *evlist, struct target *_target, struct timespec *ts, int argc, const char **argv)
struct perf_stat_config *config,
struct target *_target,
struct timespec *ts,
int argc, const char **argv)
{ {
bool metric_only = config->metric_only; bool metric_only = config->metric_only;
int interval = config->interval; int interval = config->interval;
......
...@@ -238,12 +238,8 @@ int create_perf_stat_counter(struct evsel *evsel, ...@@ -238,12 +238,8 @@ int create_perf_stat_counter(struct evsel *evsel,
struct perf_stat_config *config, struct perf_stat_config *config,
struct target *target, struct target *target,
int cpu); int cpu);
void void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *config,
perf_evlist__print_counters(struct evlist *evlist, struct target *_target, struct timespec *ts, int argc, const char **argv);
struct perf_stat_config *config,
struct target *_target,
struct timespec *ts,
int argc, const char **argv);
struct metric_expr; struct metric_expr;
double test_generic_metric(struct metric_expr *mexp, int cpu, struct runtime_stat *st); double test_generic_metric(struct metric_expr *mexp, int cpu, struct runtime_stat *st);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment