From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31472C43603 for ; Tue, 17 Dec 2019 14:49:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0830024655 for ; Tue, 17 Dec 2019 14:49:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576594174; bh=7/Zbvkug0rb8PR4/iN9qnzK0jAyBa0WpWgV84C+JUzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n+aAX48QbQdQD45u2MW7HdWZIP++SOiwnwtFuqiftZLZ//4jC0Gutnp8lKlcMVm6K JxaiozcOFVu4/k9QrsP6w1DOFUoHdR9hwzA1r40lZqtMxoAK3uz+cSd27BBDIrCezU cpJqqRHZvvsPrUCPvToqAphZUhE+DVtm3sygKNQk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729362AbfLQOtc (ORCPT ); Tue, 17 Dec 2019 09:49:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:41616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727941AbfLQOta (ORCPT ); Tue, 17 Dec 2019 09:49:30 -0500 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1713124680; Tue, 17 Dec 2019 14:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576594169; bh=7/Zbvkug0rb8PR4/iN9qnzK0jAyBa0WpWgV84C+JUzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tSDuOVOzkPhLuIxgaWJT/yIRqmm3GEiLehbr59OHkqW34Dl/OIzTBuCWJVVBOzljv Ui8VeFysR7BJAMchbyTE0wpVgWzIj8Klr5PRhj/d8QCymN3hkmzKEJ+fqQNFXKaGbh KHIs+S9PdlEL6jAmDt5rbxARgurYX155i17PKs5k= From: Arnaldo Carvalho de Melo To: Jiri Olsa , Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Andi Kleen , Jin Yao , Kan Liang , Linus Torvalds Subject: [PATCH 11/12] perf report/top: Make 'e' visible in the help and make it toggle showing callchains Date: Tue, 17 Dec 2019 11:48:27 -0300 Message-Id: <20191217144828.2460-12-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191217144828.2460-1-acme@kernel.org> References: <20191217144828.2460-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo The 'e' and 'c' hotkeys were present for a long time, but not documented in the help window, change 'e' to be a toggle so that it gets consistent with other toggles like '+' and document it in the help window. Keep 'c' as is for people used to it but don't document, as it is easier to just use 'e' to show/hide all the callchains for a top level histogram entry. Cc: Adrian Hunter Cc: Andi Kleen Cc: Jin Yao Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-84s2zp381n4vquc1byexania@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 3f10e1a070c5..fa3a16c49398 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -407,6 +407,11 @@ static bool hist_browser__selection_has_children(struct hist_browser *browser) return container_of(ms, struct callchain_list, ms)->has_children; } +static bool hist_browser__he_selection_unfolded(struct hist_browser *browser) +{ + return browser->he_selection ? browser->he_selection->unfolded : false; +} + static bool hist_browser__selection_unfolded(struct hist_browser *browser) { struct hist_entry *he = browser->he_selection; @@ -750,7 +755,7 @@ int hist_browser__run(struct hist_browser *browser, const char *help, break; case 'e': /* Expand the selected entry. */ - hist_browser__set_folding_selected(browser, true); + hist_browser__set_folding_selected(browser, !hist_browser__he_selection_unfolded(browser)); break; case 'H': browser->show_headers = !browser->show_headers; @@ -2938,6 +2943,7 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, "a Annotate current symbol\n" \ "C Collapse all callchains\n" \ "d Zoom into current DSO\n" \ + "e Expand/Collapse main entry callchains\n" \ "E Expand all callchains\n" \ "F Toggle percentage of filtered entries\n" \ "H Display column headers\n" \ -- 2.21.0