Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751660AbdIMHsW (ORCPT ); Wed, 13 Sep 2017 03:48:22 -0400 Received: from terminus.zytor.com ([65.50.211.136]:38011 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751061AbdIMHsT (ORCPT ); Wed, 13 Sep 2017 03:48:19 -0400 Date: Wed, 13 Sep 2017 00:46:04 -0700 From: tip-bot for Milian Wolff Message-ID: Cc: namhyung@kernel.org, hpa@zytor.com, dsahern@gmail.com, yao.jin@linux.intel.com, mingo@kernel.org, a.p.zijlstra@chello.nl, milian.wolff@kdab.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com Reply-To: namhyung@kernel.org, hpa@zytor.com, mingo@kernel.org, dsahern@gmail.com, yao.jin@linux.intel.com, a.p.zijlstra@chello.nl, milian.wolff@kdab.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com In-Reply-To: <20170911111422.31903-1-milian.wolff@kdab.com> References: <20170911111422.31903-1-milian.wolff@kdab.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Support running perf binaries with a dash in their name Git-Commit-ID: 3192f1ed3dd3a6883d5ae31bf2ff69984ea0fd54 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2726 Lines: 73 Commit-ID: 3192f1ed3dd3a6883d5ae31bf2ff69984ea0fd54 Gitweb: http://git.kernel.org/tip/3192f1ed3dd3a6883d5ae31bf2ff69984ea0fd54 Author: Milian Wolff AuthorDate: Mon, 11 Sep 2017 13:14:22 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Sep 2017 12:48:54 -0300 perf tools: Support running perf binaries with a dash in their name Previously the part behind "perf-" was interpreted as an internal perf command. If the suffix could not be handled, the execution was stopped. This makes it impossible to launch perf binaries that got renamed to have the `perf-` prefix. This is e.g. the case for appimages (e.g. "perf-x86_64.AppImage"), but would also apply to all other scenarios where users symlink or rename perf themselves: Status quo with the broken behavior: $ ln -s ./perf ./perf-custom-suffix $ ./perf-custom-suffix list cannot handle custom-suffix internally$ Also note the missing newline at the end of the error message. With this patch applied, the above works properly: $ ./perf-custom-suffix list List of pre-defined events (to be used in -e): ... Signed-off-by: Milian Wolff Acked-by: David Ahern Tested-by: Arnaldo Carvalho de Melo Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Yao Jin Link: http://lkml.kernel.org/r/20170911111422.31903-1-milian.wolff@kdab.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index e0279ba..2f19e03 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -467,15 +467,21 @@ int main(int argc, const char **argv) * - cannot execute it externally (since it would just do * the same thing over again) * - * So we just directly call the internal command handler, and - * die if that one cannot handle it. + * So we just directly call the internal command handler. If that one + * fails to handle this, then maybe we just run a renamed perf binary + * that contains a dash in its name. To handle this scenario, we just + * fall through and ignore the "xxxx" part of the command string. */ if (strstarts(cmd, "perf-")) { cmd += 5; argv[0] = cmd; handle_internal_command(argc, argv); - fprintf(stderr, "cannot handle %s internally", cmd); - goto out; + /* + * If the command is handled, the above function does not + * return undo changes and fall through in such a case. + */ + cmd -= 5; + argv[0] = cmd; } if (strstarts(cmd, "trace")) { #ifdef HAVE_LIBAUDIT_SUPPORT