From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753040AbbLNIO2 (ORCPT ); Mon, 14 Dec 2015 03:14:28 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52135 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743AbbLNIO0 (ORCPT ); Mon, 14 Dec 2015 03:14:26 -0500 Date: Mon, 14 Dec 2015 00:14:12 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, jpoimboe@redhat.com, namhyung@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com Reply-To: a.p.zijlstra@chello.nl, dsahern@gmail.com, acme@redhat.com, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com, jpoimboe@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf top: Do show usage message when failing to create cpu/thread maps Git-Commit-ID: f8a5c0b24b8b1e77a0812b0c8251db0afc0524b7 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 Commit-ID: f8a5c0b24b8b1e77a0812b0c8251db0afc0524b7 Gitweb: http://git.kernel.org/tip/f8a5c0b24b8b1e77a0812b0c8251db0afc0524b7 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 10 Dec 2015 14:48:45 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 10 Dec 2015 15:47:47 -0300 perf top: Do show usage message when failing to create cpu/thread maps This is necessary to get rid of the browser dependency from usage_with_options() and its friends. Because we validate the targets which are used to create the cpu/thread maps and inform the user about any override performed via the chosen UI, we don't need to call the usage routine for that. Cc: David Ahern Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-slu7lj7buzpwgop1vo9la8ma@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-top.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 7e2e72e..84fd636 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1279,8 +1279,11 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) if (target__none(target)) target->system_wide = true; - if (perf_evlist__create_maps(top.evlist, target) < 0) - usage_with_options(top_usage, options); + if (perf_evlist__create_maps(top.evlist, target) < 0) { + ui__error("Couldn't create thread/CPU maps: %s\n", + errno == ENOENT ? "No such process" : strerror_r(errno, errbuf, sizeof(errbuf))); + goto out_delete_evlist; + } if (!top.evlist->nr_entries && perf_evlist__add_default(top.evlist) < 0) {