lkml.org 
[lkml]   [2013]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/6] perf tools: Add PERF_EVLIST__ERRNO_IOCTL_ID_GROUP internal error
Date
Adding internal error (PERF_EVLIST__ERRNO_IOCTL_ID_GROUP) for
cases when ioctl syscall fails during perf_evlist__mmap call.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Andi Kleen <andi@firstfloor.org>
---
tools/perf/util/evlist.c | 9 ++++++++-
tools/perf/util/evlist.h | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 4af0cca..f9c5abd 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -399,8 +399,10 @@ static int perf_evlist__id_add_fd(struct perf_evlist *evlist,
* This way does not work with group format read, so bail
* out in that case.
*/
- if (perf_evlist__read_format(evlist) & PERF_FORMAT_GROUP)
+ if (perf_evlist__read_format(evlist) & PERF_FORMAT_GROUP) {
+ SET_ERR(IOCTL_ID_GROUP);
return -1;
+ }

if (!(evsel->attr.read_format & PERF_FORMAT_ID) ||
read(fd, &read_data, sizeof(read_data)) == -1)
@@ -676,6 +678,11 @@ static void __perf_evlist__strerror(struct perf_evlist *evlist,
case PERF_EVLIST__ERRNO_OPEN:
strerror_open(evlist, buf, size);
return;
+ case PERF_EVLIST__ERRNO_IOCTL_ID_GROUP:
+ scnprintf(buf, size,
+ "Cannot read event group on this kernel.\n"
+ "Please consider kernel update (v3.12+).\n");
+ return;
default:
scnprintf(buf, size, "Unknown error\n");
return;
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 48ac4c5..e5ce8c7 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -21,6 +21,7 @@ enum {
PERF_EVLIST__ERRNO_SUCCESS = 0,
PERF_EVLIST__ERRNO_MMAP = 1,
PERF_EVLIST__ERRNO_OPEN = 2,
+ PERF_EVLIST__ERRNO_IOCTL_ID_GROUP = 3,
};

struct perf_mmap {
--
1.8.3.1


\
 
 \ /
  Last update: 2013-11-29 13:01    [W:0.085 / U:1.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site