perf evsel: No need to always ask for PERF_FORMAT_ID in read_format
Commit-ID: 3a5afaec593954a399967155db47f72cb8828a6a Gitweb: http://git.kernel.org/tip/3a5afaec593954a399967155db47f72cb8828a6a Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 10 Dec 2012 15:29:12 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Dec 2012 17:12:58 -0300
perf evsel: No need to always ask for PERF_FORMAT_ID in read_format
Instead make perf_evlist__confir_attrs use perf_evsel__set_sample_id() when having more than one event, that way only if we have multiple events we'll ask to have the event ids returned when we read its file descriptors.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/test-record-group | 2 ++ tools/perf/tests/attr/test-record-group1 | 2 ++ tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 3 +-- 5 files changed, 7 insertions(+), 4 deletions(-)
tools/perf/tests/attr/base-record +1 -1
@@ -7,7 +7,7 @@ size=96 config=0 sample_period=4000 sample_type=263 -read_format=7 +read_format=3 disabled=1 inherit=1 pinned=0
tools/perf/tests/attr/test-record-group +2 -0
@@ -6,12 +6,14 @@ args = --group -e cycles,instructions kill >/dev/null 2>&1 fd=1 group_fd=-1 sample_type=327 +read_format=7 [event-2:base-record] fd=2 group_fd=1 config=1 sample_type=327 +read_format=7 mmap=0 comm=0 enable_on_exec=0
tools/perf/tests/attr/test-record-group1 +2 -0
@@ -6,6 +6,7 @@ args = -e '{cycles,instructions}' kill >/tmp/krava 2>&1 fd=1 group_fd=-1 sample_type=327 +read_format=7 [event-2:base-record] fd=2
@@ -13,6 +14,7 @@ group_fd=1 type=0 config=1 sample_type=327 +read_format=7 mmap=0 comm=0 enable_on_exec=0
tools/perf/util/evlist.c +1 -1
@@ -61,7 +61,7 @@ void perf_evlist__config_attrs(struct perf_evlist *evlist,perf_evsel__config (evsel, opts);if (evlist->nr_entries >1 ) -perf_evsel__set_sample_bit (evsel,ID ); +perf_evsel__set_sample_id (evsel); } }
tools/perf/util/evsel.c +1 -2
@@ -466,8 +466,7 @@ void perf_evsel__config(struct perf_evsel *evsel, attr->sample_id_all = opts->sample_id_all_missing ?0 :1 ; attr->inherit = !opts->no_inherit; attr->read_format =PERF_FORMAT_TOTAL_TIME_ENABLED | -PERF_FORMAT_TOTAL_TIME_RUNNING | -PERF_FORMAT_ID ; +PERF_FORMAT_TOTAL_TIME_RUNNING ;perf_evsel__set_sample_bit (evsel,IP );perf_evsel__set_sample_bit (evsel,TID );