Commit-ID:  6ef068cb8e77784431b6c80adc49d0b0a6a5df66
Gitweb:     http://git.kernel.org/tip/6ef068cb8e77784431b6c80adc49d0b0a6a5df66
Author:     Arnaldo Carvalho de Melo <a...@redhat.com>
AuthorDate: Thu, 17 Oct 2013 12:07:58 -0300
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Thu, 17 Oct 2013 14:35:20 -0300

perf evlist: Introduce perf_evlist__strerror_tp method

Out of 'perf trace', should be used by other tools that uses
tracepoints.

Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Ramkumar Ramachandra <artag...@gmail.com>
Cc: Stephane Eranian <eran...@google.com>
Link: http://lkml.kernel.org/n/tip-lyvtxhchz4ga8fwht15x8...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/builtin-trace.c | 26 +++++---------------------
 tools/perf/util/evlist.c   | 27 +++++++++++++++++++++++++++
 tools/perf/util/evlist.h   |  2 ++
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index ec82895..78b0d6a 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1814,27 +1814,11 @@ out:
        trace->live = false;
        return err;
 out_error_tp:
-       switch(errno) {
-       case ENOENT:
-               fputs("Error:\tUnable to find debugfs\n"
-                     "Hint:\tWas your kernel was compiled with debugfs 
support?\n"
-                     "Hint:\tIs the debugfs filesystem mounted?\n"
-                     "Hint:\tTry 'sudo mount -t debugfs nodev 
/sys/kernel/debug'\n",
-                     trace->output);
-               break;
-       case EACCES:
-               fprintf(trace->output,
-                       "Error:\tNo permissions to read 
%s/tracing/events/raw_syscalls\n"
-                       "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",
-                       debugfs_mountpoint, debugfs_mountpoint);
-               break;
-       default: {
-               char bf[256];
-               fprintf(trace->output, "Can't trace: %s\n",
-                       strerror_r(errno, bf, sizeof(bf)));
-       }
-               break;
-       }
+{
+       char errbuf[BUFSIZ];
+       perf_evlist__strerror_tp(evlist, errno, errbuf, sizeof(errbuf));
+       fprintf(trace->output, "%s\n", errbuf);
+}
        goto out_delete_evlist;
 }
 
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index cb9523f..6737420 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1126,3 +1126,30 @@ size_t perf_evlist__fprintf(struct perf_evlist *evlist, 
FILE *fp)
 
        return printed + fprintf(fp, "\n");;
 }
+
+int perf_evlist__strerror_tp(struct perf_evlist *evlist __maybe_unused,
+                            int err, char *buf, size_t size)
+{
+       char sbuf[128];
+
+       switch (err) {
+       case ENOENT:
+               scnprintf(buf, size, "%s",
+                         "Error:\tUnable to find debugfs\n"
+                         "Hint:\tWas your kernel was compiled with debugfs 
support?\n"
+                         "Hint:\tIs the debugfs filesystem mounted?\n"
+                         "Hint:\tTry 'sudo mount -t debugfs nodev 
/sys/kernel/debug'");
+               break;
+       case EACCES:
+               scnprintf(buf, size,
+                         "Error:\tNo permissions to read 
%s/tracing/events/raw_syscalls\n"
+                         "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",
+                         debugfs_mountpoint, debugfs_mountpoint);
+               break;
+       default:
+               scnprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf)));
+               break;
+       }
+
+       return 0;
+}
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 722618f..386de10 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -168,6 +168,8 @@ static inline struct perf_evsel *perf_evlist__last(struct 
perf_evlist *evlist)
 
 size_t perf_evlist__fprintf(struct perf_evlist *evlist, FILE *fp);
 
+int perf_evlist__strerror_tp(struct perf_evlist *evlist, int err, char *buf, 
size_t size);
+
 static inline unsigned int perf_mmap__read_head(struct perf_mmap *mm)
 {
        struct perf_event_mmap_page *pc = mm->base;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to