From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, adrian.hunter@intel.com,
linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v1 02/10] tools, pager: Support overwriting the pager
Date: Wed, 29 Aug 2018 10:18:26 -0700 [thread overview]
Message-ID: <20180829171834.6590-3-andi@firstfloor.org> (raw)
In-Reply-To: <20180829171834.6590-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Add an interface to the auto pager code that allows callers
to overwrite the pager.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
| 11 ++++++++++-
| 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
--git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c
index 9997a8805a82..e3d47b59b14d 100644
--- a/tools/lib/subcmd/pager.c
+++ b/tools/lib/subcmd/pager.c
@@ -23,6 +23,13 @@ void pager_init(const char *pager_env)
subcmd_config.pager_env = pager_env;
}
+static const char *forced_pager;
+
+void force_pager(const char *pager)
+{
+ forced_pager = pager;
+}
+
static void pager_preexec(void)
{
/*
@@ -66,7 +73,9 @@ void setup_pager(void)
const char *pager = getenv(subcmd_config.pager_env);
struct winsize sz;
- if (!isatty(1))
+ if (forced_pager)
+ pager = forced_pager;
+ if (!isatty(1) && !forced_pager)
return;
if (ioctl(1, TIOCGWINSZ, &sz) == 0)
pager_columns = sz.ws_col;
--git a/tools/lib/subcmd/pager.h b/tools/lib/subcmd/pager.h
index f1a53cf29880..a818964693ab 100644
--- a/tools/lib/subcmd/pager.h
+++ b/tools/lib/subcmd/pager.h
@@ -7,5 +7,6 @@ extern void pager_init(const char *pager_env);
extern void setup_pager(void);
extern int pager_in_use(void);
extern int pager_get_columns(void);
+extern void force_pager(const char *);
#endif /* __SUBCMD_PAGER_H */
--
2.17.1
next prev parent reply other threads:[~2018-08-29 17:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 17:18 Make perf script easier to use for itrace Andi Kleen
2018-08-29 17:18 ` [PATCH v1 01/10] perf tools: Report itrace options in help Andi Kleen
2018-08-30 8:56 ` Jiri Olsa
2018-08-29 17:18 ` Andi Kleen [this message]
2018-08-29 17:18 ` [PATCH v1 03/10] tools, perf, script: Add --insn-trace for instruction decoding Andi Kleen
2018-08-30 8:56 ` Jiri Olsa
2018-08-30 13:55 ` Andi Kleen
2018-09-19 18:12 ` Arnaldo Carvalho de Melo
2018-09-19 20:02 ` Andi Kleen
2018-09-19 20:38 ` Arnaldo Carvalho de Melo
2018-08-29 17:18 ` [PATCH v1 04/10] perf, tools, script: Allow sym and dso without ip, addr Andi Kleen
2018-08-30 8:56 ` Jiri Olsa
2018-08-29 17:18 ` [PATCH v1 05/10] perf, tools, script: Print DSO for callindent Andi Kleen
2018-08-30 8:57 ` Jiri Olsa
2018-08-29 17:18 ` [PATCH v1 06/10] tools, perf, script: Set user_set/wildcard_set for +- fields in -F Andi Kleen
2018-08-30 8:59 ` Jiri Olsa
2018-08-29 17:18 ` [PATCH v1 07/10] perf, tools, script: Implement - for typed fields Andi Kleen
2018-08-29 17:18 ` [PATCH v1 08/10] perf, tools, script: Make itrace script default to all calls Andi Kleen
2018-08-29 17:18 ` [PATCH v1 09/10] tools, perf, script: Add --call-trace and --call-ret-trace Andi Kleen
2018-08-29 17:18 ` [PATCH v1 10/10] tools, perf, script: Implement --graph-function Andi Kleen
2018-08-30 8:42 ` Make perf script easier to use for itrace Jiri Olsa
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=20180829171834.6590-3-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).