hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf tools: Query terminal width and use in perf list 

Automatically adapt the now wider and word wrapped perf list output to
wider terminals. This requires querying the terminal before the auto
pager takes over, and exporting this information from the pager
subsystem.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/1473978296-20712-8-git-send-email-sukadev@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2016-09-15 15:24:44 -07:00 committed by Arnaldo Carvalho de Melo
parent 08e60ed15d
commit 61eb2eb434
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/lib/subcmd/pager.c
View File

@ -3,6 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <sys/ioctl.h>
#include "pager.h" #include "pager.h"
#include "run-command.h" #include "run-command.h"
#include "sigchain.h" #include "sigchain.h"
@ -14,6 +15,7 @@
*/ */
static int spawned_pager; static int spawned_pager;
static int pager_columns;
void pager_init(const char *pager_env) void pager_init(const char *pager_env)
{ {
@ -58,9 +60,12 @@ static void wait_for_pager_signal(int signo)
void setup_pager(void) void setup_pager(void)
{ {
const char *pager = getenv(subcmd_config.pager_env); const char *pager = getenv(subcmd_config.pager_env);
struct winsize sz;
if (!isatty(1)) if (!isatty(1))
return; return;
if (ioctl(1, TIOCGWINSZ, &sz) == 0)
pager_columns = sz.ws_col;
if (!pager) if (!pager)
pager = getenv("PAGER"); pager = getenv("PAGER");
if (!(pager || access("/usr/bin/pager", X_OK))) if (!(pager || access("/usr/bin/pager", X_OK)))
@ -98,3 +103,14 @@ int pager_in_use(void)
{ {
return spawned_pager; return spawned_pager;
} }
int pager_get_columns(void)
{
char *s;
s = getenv("COLUMNS");
if (s)
return atoi(s);
return (pager_columns ? pager_columns : 80) - 2;
}

1
tools/lib/subcmd/pager.h
View File

@ -5,5 +5,6 @@ extern void pager_init(const char *pager_env);
extern void setup_pager(void); extern void setup_pager(void);
extern int pager_in_use(void); extern int pager_in_use(void);
extern int pager_get_columns(void);
#endif /* __SUBCMD_PAGER_H */ #endif /* __SUBCMD_PAGER_H */

3
tools/perf/util/pmu.c
View File

@ -14,6 +14,7 @@
#include "cpumap.h" #include "cpumap.h"
#include "header.h" #include "header.h"
#include "pmu-events/pmu-events.h" #include "pmu-events/pmu-events.h"
#include "cache.h"
struct perf_pmu_format { struct perf_pmu_format {
char *name; char *name;
@ -1092,7 +1093,7 @@ void print_pmu_events(const char *event_glob, bool name_only)
int len, j; int len, j;
struct pair *aliases; struct pair *aliases;
int numdesc = 0; int numdesc = 0;
int columns = 78; int columns = pager_get_columns();
pmu = NULL; pmu = NULL;
len = 0; len = 0;