From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753495AbcHPSRH (ORCPT <rfc822;w@1wt.eu>);
	Tue, 16 Aug 2016 14:17:07 -0400
Received: from terminus.zytor.com ([198.137.202.10]:38686 "EHLO
	terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753413AbcHPSRD (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 16 Aug 2016 14:17:03 -0400
Date: Tue, 16 Aug 2016 11:14:57 -0700
From: tip-bot for He Kuang <tipbot@zytor.com>
Message-ID: <tip-88ded4d8d94a550624e1827478e13fecf97a7b0a@git.kernel.org>
Cc: linux-kernel@vger.kernel.org, hekuang@huawei.com, acme@redhat.com,
        tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org,
        alexander.shishkin@linux.intel.com, wangnan0@huawei.com, hpa@zytor.com
Reply-To: mingo@kernel.org, tglx@linutronix.de, hekuang@huawei.com,
        linux-kernel@vger.kernel.org, acme@redhat.com, wangnan0@huawei.com,
        hpa@zytor.com, peterz@infradead.org,
        alexander.shishkin@linux.intel.com
In-Reply-To: <1470309943-153909-1-git-send-email-hekuang@huawei.com>
References: <1470309943-153909-1-git-send-email-hekuang@huawei.com>
To: linux-tip-commits@vger.kernel.org
Subject: [tip:perf/urgent] perf script: Show proper message when failed list
 scripts
Git-Commit-ID: 88ded4d8d94a550624e1827478e13fecf97a7b0a
X-Mailer: tip-git-log-daemon
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit-ID:  88ded4d8d94a550624e1827478e13fecf97a7b0a
Gitweb:     http://git.kernel.org/tip/88ded4d8d94a550624e1827478e13fecf97a7b0a
Author:     He Kuang <hekuang@huawei.com>
AuthorDate: Thu, 4 Aug 2016 11:25:42 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 15 Aug 2016 13:17:10 -0300

perf script: Show proper message when failed list scripts

Perf shows the usage message when perf scripts folder failed to open,
which misleads users to let them think the command is being mistyped.

This patch shows a proper message and guides users to check the
PERF_EXEC_PATH environment variable in that case.

Before:

  $ perf script --list

  Usage: perf script [<options>]
   or: perf script [<options>] record <script> [<record-options>] <command>
   or: perf script [<options>] report <script> [script-args]
   or: perf script [<options>] <script> [<record-options>] <command>
   or: perf script [<options>] <top-script> [script-args]

      -l, --list            list available scripts

After:

  $ perf script --list
  open(/home/user/perf-core/scripts) failed.
  Check for "PERF_EXEC_PATH" env to set scripts dir.

Signed-off-by: He Kuang <hekuang@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1470309943-153909-1-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-script.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 9c640a8..45c51eb 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1690,8 +1690,13 @@ static int list_available_scripts(const struct option *opt __maybe_unused,
 	snprintf(scripts_path, MAXPATHLEN, "%s/scripts", get_argv_exec_path());
 
 	scripts_dir = opendir(scripts_path);
-	if (!scripts_dir)
-		return -1;
+	if (!scripts_dir) {
+		fprintf(stdout,
+			"open(%s) failed.\n"
+			"Check \"PERF_EXEC_PATH\" env to set scripts dir.\n",
+			scripts_path);
+		exit(-1);
+	}
 
 	for_each_lang(scripts_path, scripts_dir, lang_dirent) {
 		snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,