leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf evlist: Use the right prefix for 'struct evlist' methods: evlist__set_leader()

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2020-11-30 09:22:07 -03:00
parent 56933029d0
commit a622eafa1a
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,7 +733,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
} }
if (group) if (group)
perf_evlist__set_leader(evsel_list); evlist__set_leader(evsel_list);
if (affinity__setup(&affinity) < 0) if (affinity__setup(&affinity) < 0)
return -1; return -1;

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

@@ -212,7 +212,7 @@ out:
return err; return err;
} }
void __perf_evlist__set_leader(struct list_head *list) void __evlist__set_leader(struct list_head *list)
{ {
struct evsel *evsel, *leader; struct evsel *evsel, *leader;
@@ -226,11 +226,11 @@ void __perf_evlist__set_leader(struct list_head *list)
} }
} }
void perf_evlist__set_leader(struct evlist *evlist) void evlist__set_leader(struct evlist *evlist)
{ {
if (evlist->core.nr_entries) { if (evlist->core.nr_entries) {
evlist->nr_groups = evlist->core.nr_entries > 1 ? 1 : 0; evlist->nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;
__perf_evlist__set_leader(&evlist->core.entries); __evlist__set_leader(&evlist->core.entries);
} }
} }
@@ -1694,7 +1694,7 @@ void perf_evlist__force_leader(struct evlist *evlist)
if (!evlist->nr_groups) { if (!evlist->nr_groups) {
struct evsel *leader = evlist__first(evlist); struct evsel *leader = evlist__first(evlist);
perf_evlist__set_leader(evlist); evlist__set_leader(evlist);
leader->forced_leader = true; leader->forced_leader = true;
} }
} }

4
tools/perf/util/evlist.h
View File

@@ -220,8 +220,8 @@ void perf_evlist__set_selected(struct evlist *evlist,
int perf_evlist__create_maps(struct evlist *evlist, struct target *target); int perf_evlist__create_maps(struct evlist *evlist, struct target *target);
int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel); int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel);
void __perf_evlist__set_leader(struct list_head *list); void __evlist__set_leader(struct list_head *list);
void perf_evlist__set_leader(struct evlist *evlist); void evlist__set_leader(struct evlist *evlist);
u64 __evlist__combined_sample_type(struct evlist *evlist); u64 __evlist__combined_sample_type(struct evlist *evlist);
u64 evlist__combined_sample_type(struct evlist *evlist); u64 evlist__combined_sample_type(struct evlist *evlist);

2
tools/perf/util/parse-events.c
View File

@@ -1769,7 +1769,7 @@ void parse_events__set_leader(char *name, struct list_head *list,
if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state)) if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state))
return; return;
__perf_evlist__set_leader(list); __evlist__set_leader(list);
leader = list_entry(list->next, struct evsel, core.node); leader = list_entry(list->next, struct evsel, core.node);
leader->group_name = name ? strdup(name) : NULL; leader->group_name = name ? strdup(name) : NULL;
} }

2
tools/perf/util/python.c
View File

@@ -1089,7 +1089,7 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist,
return NULL; return NULL;
if (group) if (group)
perf_evlist__set_leader(evlist); evlist__set_leader(evlist);
if (evlist__open(evlist) < 0) { if (evlist__open(evlist) < 0) {
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);

2
tools/perf/util/record.c
View File

@@ -102,7 +102,7 @@ void perf_evlist__config(struct evlist *evlist, struct record_opts *opts,
* since some might depend on this info. * since some might depend on this info.
*/ */
if (opts->group) if (opts->group)
perf_evlist__set_leader(evlist); evlist__set_leader(evlist);
if (evlist->core.cpus->map[0] < 0) if (evlist->core.cpus->map[0] < 0)
opts->no_inherit = true; opts->no_inherit = true;