From: tip-bot for Arnaldo Carvalho de Melo <acme@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, paulus@samba.org, acme@redhat.com,
hpa@zytor.com, mingo@redhat.com, peterz@infradead.org,
efault@gmx.de, fweisbec@gmail.com, tglx@linutronix.de,
mingo@elte.hu
Subject: [tip:perf/core] perf top: Use all the lines in the screen
Date: Tue, 17 Nov 2009 06:31:53 GMT [thread overview]
Message-ID: <tip-3b6ed98895b0fccd8c387f3fc44016fb922c0658@git.kernel.org> (raw)
In-Reply-To: <1258407027-384-2-git-send-email-acme@infradead.org>
Commit-ID: 3b6ed98895b0fccd8c387f3fc44016fb922c0658
Gitweb: http://git.kernel.org/tip/3b6ed98895b0fccd8c387f3fc44016fb922c0658
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 16 Nov 2009 19:30:27 -0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 17 Nov 2009 07:19:53 +0100
perf top: Use all the lines in the screen
By querying the current number of rows, if the user specifies
the number of entries, use that instead. If the user uses the
'e' command to change the number of lines 0 will mean do it
automatically, any other number disables the auto resizing.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1258407027-384-2-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
tools/perf/builtin-top.c | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 6613f98..3af9520 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -60,7 +60,7 @@ static int system_wide = 0;
static int default_interval = 0;
static int count_filter = 5;
-static int print_entries = 15;
+static int print_entries;
static int target_pid = -1;
static int inherit = 0;
@@ -115,6 +115,36 @@ struct sym_entry {
* Source functions
*/
+/* most GUI terminals set LINES (although some don't export it) */
+static int term_rows(void)
+{
+ char *lines_string = getenv("LINES");
+ int n_lines;
+
+ if (lines_string && (n_lines = atoi(lines_string)) > 0)
+ return n_lines;
+#ifdef TIOCGWINSZ
+ else {
+ struct winsize ws;
+ if (!ioctl(1, TIOCGWINSZ, &ws) && ws.ws_row)
+ return ws.ws_row;
+ }
+#endif
+ return 25;
+}
+
+static void update_print_entries(void)
+{
+ print_entries = term_rows();
+ if (print_entries > 9)
+ print_entries -= 9;
+}
+
+static void sig_winch_handler(int sig __used)
+{
+ update_print_entries();
+}
+
static void parse_source(struct sym_entry *syme)
{
struct symbol *sym;
@@ -668,6 +698,11 @@ static void handle_keypress(int c)
break;
case 'e':
prompt_integer(&print_entries, "Enter display entries (lines)");
+ if (print_entries == 0) {
+ update_print_entries();
+ signal(SIGWINCH, sig_winch_handler);
+ } else
+ signal(SIGWINCH, SIG_DFL);
break;
case 'E':
if (nr_counters > 1) {
@@ -1228,5 +1263,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
if (target_pid != -1 || profile_cpu != -1)
nr_cpus = 1;
+ if (print_entries == 0) {
+ update_print_entries();
+ signal(SIGWINCH, sig_winch_handler);
+ }
+
return __cmd_top();
}
next prev parent reply other threads:[~2009-11-17 6:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 21:30 [PATCH 1/2] perf tools: Don't die in perf_header_attr__new Arnaldo Carvalho de Melo
2009-11-16 21:30 ` [PATCH 2/2] perf top: Use all the lines in the screen Arnaldo Carvalho de Melo
2009-11-17 6:31 ` tip-bot for Arnaldo Carvalho de Melo [this message]
2009-11-17 6:31 ` [tip:perf/core] perf tools: Don't die in perf_header_attr__new() tip-bot for Arnaldo Carvalho de Melo
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=tip-3b6ed98895b0fccd8c387f3fc44016fb922c0658@git.kernel.org \
--to=acme@redhat.com \
--cc=efault@gmx.de \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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
Powered by JetHome