linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Clark Williams <williams@redhat.com>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Andi Kleen <ak@linux.intel.com>,
	Jin Yao <yao.jin@linux.intel.com>,
	Kan Liang <kan.liang@intel.com>
Subject: [PATCH 11/20] perf report/top: Add menu entry for toggling callchain expansion
Date: Mon,  6 Jan 2020 13:06:56 -0300	[thread overview]
Message-ID: <20200106160705.10899-12-acme@kernel.org> (raw)
In-Reply-To: <20200106160705.10899-1-acme@kernel.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Since previously pressing ENTER toggled expansion/collapse of callchain
entries and now brings up the same menu used when callchains are not
present, add an entry so that users can quickly figure out the change in
behaviour.

Its worth mentioning that we also always had 'e'/'c' to expand/collapse
all entries in a hist entry and 'E'/'C' for all hist entries.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-f9o03jo29fypvd8ly3j49d36@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/hists.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index fefa505d4fa8..1b5a5990dddb 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2527,6 +2527,26 @@ add_dso_opt(struct hist_browser *browser, struct popup_action *act,
 	return 1;
 }
 
+static int do_toggle_callchain(struct hist_browser *browser, struct popup_action *act __maybe_unused)
+{
+	hist_browser__toggle_fold(browser);
+	return 0;
+}
+
+static int add_callchain_toggle_opt(struct hist_browser *browser, struct popup_action *act, char **optstr)
+{
+	struct hist_entry *he = browser->he_selection;
+
+        if (!he->has_children)
+                return 0;
+
+	if (asprintf(optstr, "Expand/Collapse callchain") < 0)
+		return 0;
+
+	act->fn = do_toggle_callchain;
+	return 1;
+}
+
 static int
 do_browse_map(struct hist_browser *browser __maybe_unused,
 	      struct popup_action *act)
@@ -3137,6 +3157,7 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events,
 					     &options[nr_options], thread);
 		nr_options += add_dso_opt(browser, &actions[nr_options],
 					  &options[nr_options], map);
+		nr_options += add_callchain_toggle_opt(browser, &actions[nr_options], &options[nr_options]);
 		nr_options += add_map_opt(browser, &actions[nr_options],
 					  &options[nr_options],
 					  browser->selection ?
-- 
2.21.1

  parent reply	other threads:[~2020-01-06 16:06 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-06 16:06 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 01/20] tools bitmap: Implement bitmap_equal() operation at bitmap API Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 02/20] perf mmap: Declare type for cpu mask of arbitrary length Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 03/20] perf record: Adapt affinity to machines with #CPUs > 1K Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 04/20] perf sched timehist: Add support for filtering on CPU Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 05/20] perf tests bp_signal: Show expected versus obtained values Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 06/20] libperf: Move to tools/lib/perf Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 07/20] libperf: Add man pages Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 08/20] tools lib api fs: Fix gcc9 stringop-truncation compilation error Arnaldo Carvalho de Melo
2020-01-07  9:16   ` Petr Mladek
2020-01-06 16:06 ` [PATCH 09/20] perf hists browser: Restore ESC as "Zoom out" of DSO/thread/etc Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 10/20] perf report/top: Make ENTER consistently bring up menu Arnaldo Carvalho de Melo
2020-01-06 16:06 ` Arnaldo Carvalho de Melo [this message]
2020-01-06 16:06 ` [PATCH 12/20] perf report/top: Improve toggle callchain menu option Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 13/20] perf hists browser: Generalize the do_zoom_dso() function Arnaldo Carvalho de Melo
2020-01-06 16:06 ` [PATCH 14/20] perf report/top: Add 'k' hotkey to zoom directly into the kernel map Arnaldo Carvalho de Melo
2020-01-06 16:07 ` [PATCH 15/20] perf hists browser: Allow passing an initial hotkey Arnaldo Carvalho de Melo
2020-01-06 16:07 ` [PATCH 16/20] tools ui popup: Allow returning hotkeys Arnaldo Carvalho de Melo
2020-01-06 16:07 ` [PATCH 17/20] perf report/top: Allow pressing hotkeys in the options popup menu Arnaldo Carvalho de Melo
2020-01-06 16:07 ` [PATCH 18/20] perf report/top: Do not offer annotation for symbols without samples Arnaldo Carvalho de Melo
2020-01-06 16:07 ` [PATCH 19/20] perf report/top: Make 'e' visible in the help and make it toggle showing callchains Arnaldo Carvalho de Melo
2020-01-06 16:07 ` [PATCH 20/20] tools lib: Fix builds when glibc contains strlcpy() Arnaldo Carvalho de Melo
2020-01-06 17:03   ` David Laight
2020-01-07 20:48     ` Vitaly Chikunov
2020-01-10 17:50 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar
2020-01-28 19:10 ` pr-tracker-bot

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=20200106160705.10899-12-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=williams@redhat.com \
    --cc=yao.jin@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).