From: tip-bot for Masami Hiramatsu <mhiramat@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, mingo@redhat.com, peterz@infradead.org,
fweisbec@gmail.com, dle-develop@lists.sourceforge.net,
rostedt@goodmis.org, jbaron@redhat.com,
tglx@linutronix.de, mhiramat@redhat.com,
systemtap@sources.redhat.com,
linux-kernel@vger.kernel.org, hpa@zytor.com,
paulus@samba.org, fche@redhat.com, jkenisto@us.ibm.com,
hch@infradead.org, ananth@in.ibm.com,
srikar@linux.vnet.ibm.com, mingo@elte.hu,
prasad@linux.vnet.ibm.com
Subject: [tip:perf/urgent] perf probe: Show need-dwarf message only if it is really needed
Date: Tue, 15 Dec 2009 19:27:00 -0000 [thread overview]
Message-ID: <tip-411edfe5c1ef02a62ec3be56d3e234dbed71ba20@git.kernel.org> (raw)
In-Reply-To: <20091215153135.17436.99052.stgit@dhcp-100-2-132.bos.redhat.com>
Commit-ID: 411edfe5c1ef02a62ec3be56d3e234dbed71ba20
Gitweb: http://git.kernel.org/tip/411edfe5c1ef02a62ec3be56d3e234dbed71ba20
Author: Masami Hiramatsu <mhiramat@redhat.com>
AuthorDate: Tue, 15 Dec 2009 10:31:35 -0500
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 15 Dec 2009 20:22:01 +0100
perf probe: Show need-dwarf message only if it is really needed
Show need-dwarf message only if the probe is really requires
debuginfo analysis. This also use pr_debug for debugging message
instead of pr_warning.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091215153135.17436.99052.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
tools/perf/builtin-probe.c | 18 +++++++++++-------
tools/perf/util/probe-finder.c | 4 +---
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 919037b..438a7bb 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -261,15 +261,19 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
lseek(fd, SEEK_SET, 0);
ret = find_probepoint(fd, pp);
- if (ret < 0) {
- if (session.need_dwarf)
- die("Could not analyze debuginfo.");
-
- pr_warning("An error occurred in debuginfo analysis. Try to use symbols.\n");
- break;
- }
+ if (ret > 0)
+ continue;
if (ret == 0) /* No error but failed to find probe point. */
die("No probe point found.");
+ /* Error path */
+ if (session.need_dwarf) {
+ if (ret == -ENOENT)
+ pr_warning("No dwarf info found in the vmlinux - please rebuild with CONFIG_DEBUG_INFO=y.\n");
+ die("Could not analyze debuginfo.");
+ }
+ pr_debug("An error occurred in debuginfo analysis."
+ " Try to use symbols.\n");
+ break;
}
close(fd);
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 4585f1d..4b852c0 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -687,10 +687,8 @@ int find_probepoint(int fd, struct probe_point *pp)
struct probe_finder pf = {.pp = pp};
ret = dwarf_init(fd, DW_DLC_READ, 0, 0, &__dw_debug, &__dw_error);
- if (ret != DW_DLV_OK) {
- pr_warning("No dwarf info found in the vmlinux - please rebuild with CONFIG_DEBUG_INFO.\n");
+ if (ret != DW_DLV_OK)
return -ENOENT;
- }
pp->found = 0;
while (++cu_number) {
next prev parent reply other threads:[~2009-12-15 19:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 15:26 [PATCH -tip 00/14] perf-probe updates Masami Hiramatsu
2009-12-15 15:26 ` [PATCH -tip 01/14] perf probe: Cleanup struct session in builtin-probe.c Masami Hiramatsu
2009-12-15 19:27 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:26 ` [PATCH -tip 02/14] perf probe: Check the result of e_snprintf() Masami Hiramatsu
2009-12-15 19:26 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 04/14] perf probe: Show need-dwarf message only if it is really needed Masami Hiramatsu
2009-12-15 19:27 ` tip-bot for Masami Hiramatsu [this message]
2009-12-15 15:27 ` [PATCH -tip 07/14] perf tools: Add for_each macros for strlist Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 09/14] perf probe: Add glob matching support on --del Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 05/14] perf probe: Fix --del to show info instead of warning Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 06/14] perf probe: Fix --del to update current event list Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 03/14] perf probe: Check hyphen only argument Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 08/14] perf probe: Use strlist__for_each macros in probe-event.c Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 10/14] perf probe: Support event name for --add option Masami Hiramatsu
2009-12-15 19:54 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 12/14] perf probe: Check build-id of vmlinux Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 13/14] perf probe: Check symbols in symtab/kallsyms Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 11/14] perf probe: Reject second attempt of adding same-name event Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 14/14] perf probe: Fix to show which probe point is not found Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 19:23 ` [PATCH -tip 00/14] perf-probe updates 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=tip-411edfe5c1ef02a62ec3be56d3e234dbed71ba20@git.kernel.org \
--to=mhiramat@redhat.com \
--cc=acme@redhat.com \
--cc=ananth@in.ibm.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=fche@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=hpa@zytor.com \
--cc=jbaron@redhat.com \
--cc=jkenisto@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=prasad@linux.vnet.ibm.com \
--cc=rostedt@goodmis.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=systemtap@sources.redhat.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).