From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Naohiro Aota <naota@elisp.net>, Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 06/18] perf probe: Don't use strerror if strlist__add failed
Date: Fri, 15 Aug 2014 13:49:51 -0300 [thread overview]
Message-ID: <1408121403-11919-7-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1408121403-11919-1-git-send-email-acme@kernel.org>
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Since the strlist__add doesn't involves any IO, the failure reason must
be ENOMEM or EINVAL, moreover this is just a debug message, we don't
need to show the error string.
And also, if get_probe_trace_command_rawlist() returns NULL, it doesn't
mean the rawlist is empty, there is an error. So caller must use
-ENOMEM for the error.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20140814022230.3545.99254.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-event.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index ac15ff780009..bf39c23b275d 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1881,7 +1881,7 @@ static struct strlist *get_probe_trace_command_rawlist(int fd)
p[idx] = '\0';
ret = strlist__add(sl, buf);
if (ret < 0) {
- pr_debug("strlist__add failed: %s\n", strerror(-ret));
+ pr_debug("strlist__add failed (%d)\n", ret);
strlist__delete(sl);
return NULL;
}
@@ -1940,7 +1940,7 @@ static int __show_perf_probe_events(int fd, bool is_kprobe)
rawlist = get_probe_trace_command_rawlist(fd);
if (!rawlist)
- return -ENOENT;
+ return -ENOMEM;
strlist__for_each(ent, rawlist) {
ret = parse_probe_trace_command(ent->s, &tev);
@@ -2007,6 +2007,8 @@ static struct strlist *get_probe_trace_event_names(int fd, bool include_group)
memset(&tev, 0, sizeof(tev));
rawlist = get_probe_trace_command_rawlist(fd);
+ if (!rawlist)
+ return NULL;
sl = strlist__new(true, NULL);
strlist__for_each(ent, rawlist) {
ret = parse_probe_trace_command(ent->s, &tev);
--
1.9.3
next prev parent reply other threads:[~2014-08-15 16:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-15 16:49 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 01/18] perf probe: Warn user to rebuild target with debuginfo Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 02/18] perf annotate: Don't truncate Intel style addresses Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 03/18] perf tools: Add arm64 triplets Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 04/18] perf tools: Annotate PMU related list_head members with type info Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 05/18] perf report: Relax -g option parsing not to limit the option order Arnaldo Carvalho de Melo
2014-08-15 16:49 ` Arnaldo Carvalho de Melo [this message]
2014-08-15 16:49 ` [PATCH 07/18] perf: Use strerror_r instead of strerror Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 08/18] perf probe: Make error messages thread-safe Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 09/18] perf util: Replace strerror with strerror_r for thread-safety Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 10/18] perf top: Use strerror_r instead of strerror Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 11/18] perf trace: " Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 12/18] perf record: " Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 13/18] perf test: " Arnaldo Carvalho de Melo
2014-08-15 16:49 ` [PATCH 14/18] perf sched: " Arnaldo Carvalho de Melo
2014-08-15 16:50 ` [PATCH 15/18] perf buildid-cache: " Arnaldo Carvalho de Melo
2014-08-15 16:50 ` [PATCH 16/18] perf kvm: " Arnaldo Carvalho de Melo
2014-08-15 16:50 ` [PATCH 17/18] perf help: " Arnaldo Carvalho de Melo
2014-08-15 16:50 ` [PATCH 18/18] perf stat: " Arnaldo Carvalho de Melo
2014-08-18 8:18 ` [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408121403-11919-7-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=naota@elisp.net \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).