korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 15:14:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf evlist: Use the right prefix for 'struct evlist' event group methods

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 14:58:32 -03:00
parent 7748bb7175
commit 64b4778b86
7 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,7 +598,7 @@ int cmd_annotate(int argc, const char **argv)
HEADER_BRANCH_STACK); HEADER_BRANCH_STACK);
if (annotate.group_set) if (annotate.group_set)
perf_evlist__force_leader(annotate.session->evlist); evlist__force_leader(annotate.session->evlist);
ret = symbol__annotation_init(); ret = symbol__annotation_init();
if (ret < 0) if (ret < 0)

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

@ -923,7 +923,7 @@ try_again:
if ((errno == EINVAL || errno == EBADF) && if ((errno == EINVAL || errno == EBADF) &&
pos->leader != pos && pos->leader != pos &&
pos->weak_group) { pos->weak_group) {
pos = perf_evlist__reset_weak_group(evlist, pos, true); pos = evlist__reset_weak_group(evlist, pos, true);
goto try_again; goto try_again;
} }
rc = -errno; rc = -errno;

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

@ -211,7 +211,7 @@ static void setup_forced_leader(struct report *report,
struct evlist *evlist) struct evlist *evlist)
{ {
if (report->group_set) if (report->group_set)
perf_evlist__force_leader(evlist); evlist__force_leader(evlist);
} }
static int process_feature_event(struct perf_session *session, static int process_feature_event(struct perf_session *session,

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

@ -759,7 +759,7 @@ try_again:
if ((errno == EINVAL || errno == EBADF) && if ((errno == EINVAL || errno == EBADF) &&
counter->leader != counter && counter->leader != counter &&
counter->weak_group) { counter->weak_group) {
perf_evlist__reset_weak_group(evsel_list, counter, false); evlist__reset_weak_group(evsel_list, counter, false);
assert(counter->reset_group); assert(counter->reset_group);
second_pass = true; second_pass = true;
continue; continue;

6
tools/perf/util/auxtrace.c
View File

@ -62,9 +62,7 @@
* Make a group from 'leader' to 'last', requiring that the events were not * Make a group from 'leader' to 'last', requiring that the events were not
* already grouped to a different leader. * already grouped to a different leader.
*/ */
static int perf_evlist__regroup(struct evlist *evlist, static int evlist__regroup(struct evlist *evlist, struct evsel *leader, struct evsel *last)
struct evsel *leader,
struct evsel *last)
{ {
struct evsel *evsel; struct evsel *evsel;
bool grp; bool grp;
@ -775,7 +773,7 @@ no_opt:
evsel->core.attr.aux_sample_size = term->val.aux_sample_size; evsel->core.attr.aux_sample_size = term->val.aux_sample_size;
/* If possible, group with the AUX event */ /* If possible, group with the AUX event */
if (aux_evsel && evsel->core.attr.aux_sample_size) if (aux_evsel && evsel->core.attr.aux_sample_size)
perf_evlist__regroup(evlist, aux_evsel, evsel); evlist__regroup(evlist, aux_evsel, evsel);
} }
} }

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

@ -1650,7 +1650,7 @@ bool perf_evlist__exclude_kernel(struct evlist *evlist)
* the group display. Set the artificial group and set the leader's * the group display. Set the artificial group and set the leader's
* forced_leader flag to notify the display code. * forced_leader flag to notify the display code.
*/ */
void perf_evlist__force_leader(struct evlist *evlist) void 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);
@ -1660,9 +1660,7 @@ void perf_evlist__force_leader(struct evlist *evlist)
} }
} }
struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, struct evsel *evlist__reset_weak_group(struct evlist *evsel_list, struct evsel *evsel, bool close)
struct evsel *evsel,
bool close)
{ {
struct evsel *c2, *leader; struct evsel *c2, *leader;
bool is_open = true; bool is_open = true;

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

@ -324,11 +324,10 @@ struct evsel *evlist__event2evsel(struct evlist *evlist, union perf_event *event
bool perf_evlist__exclude_kernel(struct evlist *evlist); bool perf_evlist__exclude_kernel(struct evlist *evlist);
void perf_evlist__force_leader(struct evlist *evlist); void evlist__force_leader(struct evlist *evlist);
struct evsel *evlist__reset_weak_group(struct evlist *evlist, struct evsel *evsel, bool close);
struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,
struct evsel *evsel,
bool close);
#define EVLIST_CTL_CMD_ENABLE_TAG "enable" #define EVLIST_CTL_CMD_ENABLE_TAG "enable"
#define EVLIST_CTL_CMD_DISABLE_TAG "disable" #define EVLIST_CTL_CMD_DISABLE_TAG "disable"
#define EVLIST_CTL_CMD_ACK_TAG "ack\n" #define EVLIST_CTL_CMD_ACK_TAG "ack\n"