mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Masami Hiramatsu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
	mingo@redhat.com, hpa@zytor.com, mingo@kernel.org,
	a.p.zijlstra@chello.nl, naota@elisp.net, namhyung@kernel.org,
	masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de
Subject: [tip:perf/core] perf probe: Don' t use strerror if strlist__add failed
Date: Mon, 18 Aug 2014 01:22:50 -0700	[thread overview]
Message-ID: <tip-6eb08660962a91212902869672dab5199827cbfd@git.kernel.org> (raw)
In-Reply-To: <20140814022230.3545.99254.stgit@kbuild-fedora.novalocal>

Commit-ID:  6eb08660962a91212902869672dab5199827cbfd
Gitweb:     http://git.kernel.org/tip/6eb08660962a91212902869672dab5199827cbfd
Author:     Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
AuthorDate: Thu, 14 Aug 2014 02:22:30 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 15 Aug 2014 10:53:36 -0300

perf probe: Don't use strerror if strlist__add failed

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 ac15ff7..bf39c23 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);

  reply	other threads:[~2014-08-18  8:23 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-14  2:22 [PATCH 00/13] perf: Replace strerror with strerror_r for thread-safety Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 01/13] perf probe: Don't use strerror if strlist__add failed Masami Hiramatsu
2014-08-18  8:22   ` tip-bot for Masami Hiramatsu [this message]
2014-08-14  2:22 ` [PATCH 02/13] perf: Use strerror_r instead of strerror Masami Hiramatsu
2014-08-18  8:23   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 03/13] perf probe: Make error messages thread-safe Masami Hiramatsu
2014-08-18  8:23   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 04/13] perf/util: Replace strerror with strerror_r for thread-safety Masami Hiramatsu
2014-08-18  8:23   ` [tip:perf/core] perf util: " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 05/13] perf top: Use strerror_r instead of strerror Masami Hiramatsu
2014-08-18  8:23   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 06/13] perf trace: " Masami Hiramatsu
2014-08-18  8:24   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 07/13] perf record: " Masami Hiramatsu
2014-08-18  8:24   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 08/13] perf test: " Masami Hiramatsu
2014-08-18  8:24   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 09/13] perf sched: " Masami Hiramatsu
2014-08-18  8:24   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 10/13] perf buildid-cache: " Masami Hiramatsu
2014-08-18  8:25   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 11/13] perf kvm: " Masami Hiramatsu
2014-08-18  8:25   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 12/13] perf help: " Masami Hiramatsu
2014-08-18  8:25   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14  2:22 ` [PATCH 13/13] perf stat: " Masami Hiramatsu
2014-08-18  8:25   ` [tip:perf/core] " tip-bot for Masami Hiramatsu

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=tip-6eb08660962a91212902869672dab5199827cbfd@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@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 \
    --cc=tglx@linutronix.de \
    /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

all inboxes | Powered by JetHome®