diff options
author | Jiri Olsa <jolsa@redhat.com> | 2012-04-04 13:32:27 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-08-07 16:35:20 -0400 |
commit | e2b5abe0c82b45980b95ead22678861a2013c0df (patch) | |
tree | 24f1f9f6ecec3ced62743453cb4323f5104bc458 /tools/perf/util/evlist.c | |
parent | 6f5ab0019fd328b50a8488c9e5193fc1dbd8d6ed (diff) |
perf evlist: Use PERF_EVENT_IOC_ID perf ioctl to read event id
Changing the way we retrieve the event ID. Instead of parsing out
the ID out of the read data, using the PERF_EVENT_IOC_ID ioctl.
Keeping the old way in place to support kernels without
PERF_EVENT_IOC_ID ioctl support.
This will be useful for retrieving the event ID for events
with PERF_FORMAT_GROUP read format set, where it's impossible
to get correct event id out of the read call data.
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: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-psgb4n7kte8e6tfenbe7nj2h@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/evlist.c')
-rw-r--r-- | tools/perf/util/evlist.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 42ea4e947eb8..0d3b73996255 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c | |||
@@ -302,6 +302,17 @@ static int perf_evlist__id_add_fd(struct perf_evlist *evlist, | |||
302 | { | 302 | { |
303 | u64 read_data[4] = { 0, }; | 303 | u64 read_data[4] = { 0, }; |
304 | int id_idx = 1; /* The first entry is the counter value */ | 304 | int id_idx = 1; /* The first entry is the counter value */ |
305 | u64 id; | ||
306 | int ret; | ||
307 | |||
308 | ret = ioctl(fd, PERF_EVENT_IOC_ID, &id); | ||
309 | if (!ret) | ||
310 | goto add; | ||
311 | |||
312 | if (errno != ENOTTY) | ||
313 | return -1; | ||
314 | |||
315 | /* Legacy way to get event id.. All hail to old kernels! */ | ||
305 | 316 | ||
306 | if (!(evsel->attr.read_format & PERF_FORMAT_ID) || | 317 | if (!(evsel->attr.read_format & PERF_FORMAT_ID) || |
307 | read(fd, &read_data, sizeof(read_data)) == -1) | 318 | read(fd, &read_data, sizeof(read_data)) == -1) |
@@ -312,7 +323,10 @@ static int perf_evlist__id_add_fd(struct perf_evlist *evlist, | |||
312 | if (evsel->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) | 323 | if (evsel->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) |
313 | ++id_idx; | 324 | ++id_idx; |
314 | 325 | ||
315 | perf_evlist__id_add(evlist, evsel, cpu, thread, read_data[id_idx]); | 326 | id = read_data[id_idx]; |
327 | |||
328 | add: | ||
329 | perf_evlist__id_add(evlist, evsel, cpu, thread, id); | ||
316 | return 0; | 330 | return 0; |
317 | } | 331 | } |
318 | 332 | ||