diff options
author | Jiri Olsa <jolsa@redhat.com> | 2012-11-12 12:34:00 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-11-14 14:51:50 -0500 |
commit | cac21425578abddc4e9f529845832a57ba27ce0f (patch) | |
tree | 78e6795bc2c7e86ac8aed3cb25381714845ebe32 /tools/perf/tests | |
parent | 6064803313bad9ae4cae233a9d56678adb2b6e7c (diff) |
perf tools: Fix attributes for '{}' defined event groups
Fixing events attributes for groups defined via '{}'.
Currently 'enable_on_exec' attribute in record command and both
'disabled ' and 'enable_on_exec' attributes in stat command are set
based on the 'group' option. This eliminates proper setup for '{}'
defined groups as they don't set 'group' option.
Making above attributes values based on the 'evsel->leader' as this is
common to both group definition.
Moving perf_evlist__set_leader call within builtin-record ahead
perf_evlist__config_attrs call, because the latter needs possible group
leader links in place.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1352741644-16809-2-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests')
-rw-r--r-- | tools/perf/tests/attr/test-record-group1 | 4 | ||||
-rw-r--r-- | tools/perf/tests/attr/test-stat-group1 | 6 | ||||
-rw-r--r-- | tools/perf/tests/open-syscall-tp-fields.c | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/tools/perf/tests/attr/test-record-group1 b/tools/perf/tests/attr/test-record-group1 index 39bf8609538c..013572f23605 100644 --- a/tools/perf/tests/attr/test-record-group1 +++ b/tools/perf/tests/attr/test-record-group1 | |||
@@ -15,6 +15,4 @@ config=1 | |||
15 | sample_type=327 | 15 | sample_type=327 |
16 | mmap=0 | 16 | mmap=0 |
17 | comm=0 | 17 | comm=0 |
18 | # TODO this is disabled for --group option, enabled otherwise | 18 | enable_on_exec=0 |
19 | # check why.. | ||
20 | enable_on_exec=1 | ||
diff --git a/tools/perf/tests/attr/test-stat-group1 b/tools/perf/tests/attr/test-stat-group1 index 5ae2718de864..2a1f86e4a904 100644 --- a/tools/perf/tests/attr/test-stat-group1 +++ b/tools/perf/tests/attr/test-stat-group1 | |||
@@ -11,7 +11,5 @@ group_fd=-1 | |||
11 | fd=2 | 11 | fd=2 |
12 | group_fd=1 | 12 | group_fd=1 |
13 | config=1 | 13 | config=1 |
14 | # TODO both disabled and enable_on_exec are disabled for --group option, | 14 | disabled=0 |
15 | # enabled otherwise, check why.. | 15 | enable_on_exec=0 |
16 | disabled=1 | ||
17 | enable_on_exec=1 | ||
diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c index b05b6a6f01af..1c52fdc1164e 100644 --- a/tools/perf/tests/open-syscall-tp-fields.c +++ b/tools/perf/tests/open-syscall-tp-fields.c | |||
@@ -41,7 +41,7 @@ int test__syscall_open_tp_fields(void) | |||
41 | goto out_delete_evlist; | 41 | goto out_delete_evlist; |
42 | } | 42 | } |
43 | 43 | ||
44 | perf_evsel__config(evsel, &opts, evsel); | 44 | perf_evsel__config(evsel, &opts); |
45 | 45 | ||
46 | evlist->threads->map[0] = getpid(); | 46 | evlist->threads->map[0] = getpid(); |
47 | 47 | ||