From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
David Carrillo-Cisneros <davidcc@google.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>, He Kuang <hekuang@huawei.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Paul Turner <pjt@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Simon Que <sque@chromium.org>,
Stephane Eranian <eranian@google.com>,
Wang Nan <wangnan0@huawei.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 6/7] perf util: Hint missing file when tool tips fail to load
Date: Thu, 13 Apr 2017 16:35:35 -0300 [thread overview]
Message-ID: <20170413193536.3667-7-acme@kernel.org> (raw)
In-Reply-To: <20170413193536.3667-1-acme@kernel.org>
From: David Carrillo-Cisneros <davidcc@google.com>
Besides memory allocation failure, tips.txt may fail to load because the
file is not found (a more likely cause).
Communicate that to the user in tips failure warning.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170412064919.92449-5-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/util.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index d8b45cea54d0..6097d87429e2 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -696,7 +696,8 @@ const char *perf_tip(const char *dirpath)
tips = strlist__new("tips.txt", &conf);
if (tips == NULL)
- return errno == ENOENT ? NULL : "Tip: get more memory! ;-p";
+ return errno == ENOENT ? NULL :
+ "Tip: check path of tips.txt or get more memory! ;-p";
if (strlist__nr_entries(tips) == 0)
goto out;
--
2.9.3
next prev parent reply other threads:[~2017-04-13 19:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 19:35 [GIT PULL 0/7] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-04-13 19:35 ` [PATCH 1/7] perf tools: Pass PYTHON config to feature detection Arnaldo Carvalho de Melo
2017-04-13 19:35 ` [PATCH 2/7] perf stat: Fix bug in handling events in error state Arnaldo Carvalho de Melo
2017-04-13 19:35 ` [PATCH 3/7] perf trace: Add usage of --no-syscalls in man page Arnaldo Carvalho de Melo
2017-04-13 19:35 ` [PATCH 4/7] perf tools: Disable JVMTI if no ELF support available Arnaldo Carvalho de Melo
2017-04-13 19:35 ` [PATCH 5/7] tools build: Fix feature detection redefinion of build flags Arnaldo Carvalho de Melo
2017-04-13 19:35 ` Arnaldo Carvalho de Melo [this message]
2017-04-13 19:35 ` [PATCH 7/7] Revert "perf tools: Fix include of linux/mman.h" Arnaldo Carvalho de Melo
2017-04-14 16:07 ` [GIT PULL 0/7] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-04-17 8:15 ` 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=20170413193536.3667-7-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=davidcc@google.com \
--cc=eranian@google.com \
--cc=hekuang@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=sque@chromium.org \
--cc=wangnan0@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.