Skip to content

Commit

Permalink
perf evsel: Introduce is_group_member method
Browse files Browse the repository at this point in the history 
To clarify what is being tested, instead of assuming that evsel->leader
== NULL means either an 'isolated' evsel or a 'group leader'.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-lvdbvimaxw9nc5een5vmem0c@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Nov 14, 2012
1 parent 1483c2a commit 07ac002
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
3 changes: 2 additions & 1 deletion tools/perf/builtin-stat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ static int create_perf_stat_counter(struct perf_evsel *evsel)
return 0;
}

if (!perf_target__has_task(&target) && (!evsel->leader)) {
if (!perf_target__has_task(&target) &&
!perf_evsel__is_group_member(evsel)) {
attr->disabled = 1;
attr->enable_on_exec = 1;
}
Expand Down
20 changes: 10 additions & 10 deletions tools/perf/tests/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ static int test__group1(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

/* cycles:upp */
evsel = perf_evsel__next(evsel);
Expand Down Expand Up @@ -557,7 +557,7 @@ static int test__group2(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

/* cache-references + :u modifier */
evsel = perf_evsel__next(evsel);
Expand All @@ -583,7 +583,7 @@ static int test__group2(struct perf_evlist *evlist)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

return 0;
}
Expand All @@ -606,7 +606,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
TEST_ASSERT_VAL("wrong group name",
!strcmp(leader->group_name, "group1"));

Expand Down Expand Up @@ -636,7 +636,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
TEST_ASSERT_VAL("wrong group name",
!strcmp(leader->group_name, "group2"));

Expand All @@ -663,7 +663,7 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

return 0;
}
Expand All @@ -687,7 +687,7 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 1);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

/* instructions:kp + p */
evsel = perf_evsel__next(evsel);
Expand Down Expand Up @@ -724,7 +724,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

/* instructions + G */
evsel = perf_evsel__next(evsel);
Expand All @@ -751,7 +751,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

/* instructions:G */
evsel = perf_evsel__next(evsel);
Expand All @@ -777,7 +777,7 @@ static int test__group5(struct perf_evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel->leader == NULL);
TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));

return 0;
}
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 @@ -222,7 +222,7 @@ void perf_evlist__disable(struct perf_evlist *evlist)

for (cpu = 0; cpu < evlist->cpus->nr; cpu++) {
list_for_each_entry(pos, &evlist->entries, node) {
if (pos->leader)
if (perf_evsel__is_group_member(pos))
continue;
for (thread = 0; thread < evlist->threads->nr; thread++)
ioctl(FD(pos, cpu, thread),
Expand All @@ -238,7 +238,7 @@ void perf_evlist__enable(struct perf_evlist *evlist)

for (cpu = 0; cpu < cpu_map__nr(evlist->cpus); cpu++) {
list_for_each_entry(pos, &evlist->entries, node) {
if (pos->leader)
if (perf_evsel__is_group_member(pos))
continue;
for (thread = 0; thread < evlist->threads->nr; thread++)
ioctl(FD(pos, cpu, thread),
Expand Down
6 changes: 3 additions & 3 deletions tools/perf/util/evsel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,14 @@ void perf_evsel__config(struct perf_evsel *evsel,
* Disabling only independent events or group leaders,
* keeping group members enabled.
*/
if (!evsel->leader)
if (!perf_evsel__is_group_member(evsel))
attr->disabled = 1;

/*
* Setting enable_on_exec for independent events and
* group leaders for traced executed by perf.
*/
if (perf_target__none(&opts->target) && (!evsel->leader))
if (perf_target__none(&opts->target) && !perf_evsel__is_group_member(evsel))
attr->enable_on_exec = 1;
}

Expand Down Expand Up @@ -707,7 +707,7 @@ static int get_group_fd(struct perf_evsel *evsel, int cpu, int thread)
struct perf_evsel *leader = evsel->leader;
int fd;

if (!leader)
if (!perf_evsel__is_group_member(evsel))
return -1;

/*
Expand Down
6 changes: 6 additions & 0 deletions tools/perf/util/evsel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <linux/list.h>
#include <stdbool.h>
#include <stddef.h>
#include "../../../include/uapi/linux/perf_event.h"
#include "types.h"
#include "xyarray.h"
Expand Down Expand Up @@ -224,4 +225,9 @@ static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel)
{
return list_entry(evsel->node.next, struct perf_evsel, node);
}

static inline bool perf_evsel__is_group_member(const struct perf_evsel *evsel)
{
return evsel->leader != NULL;
}
#endif /* __PERF_EVSEL_H */

0 comments on commit 07ac002

Please sign in to comment.