Skip to content

Commit

Permalink
libperf: Move 'nr_groups' from tools/perf to evlist::nr_groups
Browse files Browse the repository at this point in the history 
Move evsel::nr_groups to perf_evsel::nr_groups, so we can move the group
interface to libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Requested-by: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210706151704.73662-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Jul 9, 2021
1 parent fba7c86 commit 3a68312
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 deletions.
1 change: 1 addition & 0 deletions tools/lib/perf/include/internal/evlist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ struct perf_mmap_param;
struct perf_evlist {
struct list_head entries;
int nr_entries;
int nr_groups;
bool has_user_cpus;
struct perf_cpu_map *cpus;
struct perf_cpu_map *all_cpus;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-record.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1776,7 +1776,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
rec->tool.ordered_events = false;
}

if (!rec->evlist->nr_groups)
if (!rec->evlist->core.nr_groups)
perf_header__clear_feat(&session->header, HEADER_GROUP_DESC);

if (data->is_pipe) {
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-report.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1432,7 +1432,7 @@ int cmd_report(int argc, const char **argv)

setup_forced_leader(&report, session->evlist);

if (symbol_conf.group_sort_idx && !session->evlist->nr_groups) {
if (symbol_conf.group_sort_idx && !session->evlist->core.nr_groups) {
parse_options_usage(NULL, options, "group-sort-idx", 0);
ret = -EINVAL;
goto error;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/tests/bpf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
}

evlist__splice_list_tail(evlist, &parse_state.list);
evlist->nr_groups = parse_state.nr_groups;
evlist->core.nr_groups = parse_state.nr_groups;

evlist__config(evlist, &opts, NULL);

Expand Down
22 changes: 11 additions & 11 deletions tools/perf/tests/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static int test__checkevent_tracepoint(struct evlist *evlist)
struct evsel *evsel = evlist__first(evlist);

TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->core.nr_groups);
TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->core.attr.type);
TEST_ASSERT_VAL("wrong sample_type",
PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type);
Expand All @@ -62,7 +62,7 @@ static int test__checkevent_tracepoint_multi(struct evlist *evlist)
struct evsel *evsel;

TEST_ASSERT_VAL("wrong number of entries", evlist->core.nr_entries > 1);
TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->core.nr_groups);

evlist__for_each_entry(evlist, evsel) {
TEST_ASSERT_VAL("wrong type",
Expand Down Expand Up @@ -668,7 +668,7 @@ static int test__group1(struct evlist *evlist)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* instructions:k */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -710,7 +710,7 @@ static int test__group2(struct evlist *evlist)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 3 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* faults + :ku modifier */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -765,7 +765,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->core.nr_groups);

/* group1 syscalls:sys_enter_openat:H */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -857,7 +857,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* cycles:u + p */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -901,7 +901,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->core.nr_groups);

/* cycles + G */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -987,7 +987,7 @@ static int test__group_gh1(struct evlist *evlist)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* cycles + :H group modifier */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -1027,7 +1027,7 @@ static int test__group_gh2(struct evlist *evlist)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* cycles + :G group modifier */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -1067,7 +1067,7 @@ static int test__group_gh3(struct evlist *evlist)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* cycles:G + :u group modifier */
evsel = leader = evlist__first(evlist);
Expand Down Expand Up @@ -1107,7 +1107,7 @@ static int test__group_gh4(struct evlist *evlist)
struct evsel *evsel, *leader;

TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);

/* cycles:G + :uG group modifier */
evsel = leader = evlist__first(evlist);
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/tests/pfm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static int test__pfm_events(void)
count_pfm_events(&evlist->core),
table[i].nr_events);
TEST_ASSERT_EQUAL(table[i].events,
evlist->nr_groups,
evlist->core.nr_groups,
0);

evlist__delete(evlist);
Expand Down Expand Up @@ -180,7 +180,7 @@ static int test__pfm_group(void)
count_pfm_events(&evlist->core),
table[i].nr_events);
TEST_ASSERT_EQUAL(table[i].events,
evlist->nr_groups,
evlist->core.nr_groups,
table[i].nr_groups);

evlist__delete(evlist);
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/evlist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void __evlist__set_leader(struct list_head *list)
void evlist__set_leader(struct evlist *evlist)
{
if (evlist->core.nr_entries) {
evlist->nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;
evlist->core.nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;
__evlist__set_leader(&evlist->core.entries);
}
}
Expand Down Expand Up @@ -1748,7 +1748,7 @@ bool evlist__exclude_kernel(struct evlist *evlist)
*/
void evlist__force_leader(struct evlist *evlist)
{
if (!evlist->nr_groups) {
if (!evlist->core.nr_groups) {
struct evsel *leader = evlist__first(evlist);

evlist__set_leader(evlist);
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/evlist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ enum bkw_mmap_state {

struct evlist {
struct perf_evlist core;
int nr_groups;
bool enabled;
int id_pos;
int is_pos;
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/header.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ static int write_pmu_mappings(struct feat_fd *ff,
static int write_group_desc(struct feat_fd *ff,
struct evlist *evlist)
{
u32 nr_groups = evlist->nr_groups;
u32 nr_groups = evlist->core.nr_groups;
struct evsel *evsel;
int ret;

Expand Down Expand Up @@ -2735,7 +2735,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)
* Rebuild group relationship based on the group_desc
*/
session = container_of(ff->ph, struct perf_session, header);
session->evlist->nr_groups = nr_groups;
session->evlist->core.nr_groups = nr_groups;

i = nr = 0;
evlist__for_each_entry(session->evlist, evsel) {
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2285,7 +2285,7 @@ int __parse_events(struct evlist *evlist, const char *str,
if (!ret) {
struct evsel *last;

evlist->nr_groups += parse_state.nr_groups;
evlist->core.nr_groups += parse_state.nr_groups;
last = evlist__last(evlist);
last->cmdline_group_boundary = true;

Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/pfm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int parse_libpfm_events_option(const struct option *opt, const char *str,
"cannot close a non-existing event group\n");
goto error;
}
evlist->nr_groups++;
evlist->core.nr_groups++;
grp_leader = NULL;
grp_evt = -1;
}
Expand Down

0 comments on commit 3a68312

Please sign in to comment.