Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1286197 > unrolled thread
| Started by | Josh Poimboeuf <jpoimboe@redhat.com> |
|---|---|
| First post | 2015-12-08 05:30 +0100 |
| Last post | 2015-12-10 09:20 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2 05/14] perf: Remove unused pager_use_color variable Josh Poimboeuf <jpoimboe@redhat.com> - 2015-12-08 05:30 +0100
Re: [PATCH v2 05/14] perf: Remove unused pager_use_color variable Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-09 16:50 +0100
[tip:perf/core] perf tools: Remove unused pager_use_color variable tip-bot for Josh Poimboeuf <tipbot@zytor.com> - 2015-12-10 09:20 +0100
| From | Josh Poimboeuf <jpoimboe@redhat.com> |
|---|---|
| Date | 2015-12-08 05:30 +0100 |
| Subject | [PATCH v2 05/14] perf: Remove unused pager_use_color variable |
| Message-ID | <qDi4x-5SE-7@gated-at.bofh.it> |
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
tools/perf/util/Build | 1 -
tools/perf/util/cache.h | 1 -
tools/perf/util/color.c | 2 +-
tools/perf/util/environment.c | 8 --------
4 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 tools/perf/util/environment.c
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 6c3bbd5..65fef59 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -6,7 +6,6 @@ libperf-y += config.o
libperf-y += ctype.o
libperf-y += db-export.o
libperf-y += env.o
-libperf-y += environment.o
libperf-y += event.o
libperf-y += evlist.o
libperf-y += evsel.o
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index c861373..4c2b764 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -31,7 +31,6 @@ extern const char *perf_config_dirname(const char *, const char *);
/* pager.c */
extern void setup_pager(void);
extern int pager_in_use(void);
-extern int pager_use_color;
char *alias_lookup(const char *alias);
int split_cmdline(char *cmdline, const char ***argv);
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index 9b95654..e5fb88b 100644
--- a/tools/perf/util/color.c
+++ b/tools/perf/util/color.c
@@ -24,7 +24,7 @@ int perf_config_colorbool(const char *var, const char *value, int stdout_is_tty)
auto_color:
if (stdout_is_tty < 0)
stdout_is_tty = isatty(1);
- if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
+ if (stdout_is_tty || pager_in_use()) {
char *term = getenv("TERM");
if (term && strcmp(term, "dumb"))
return 1;
diff --git a/tools/perf/util/environment.c b/tools/perf/util/environment.c
deleted file mode 100644
index 7405123..0000000
--- a/tools/perf/util/environment.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * We put all the perf config variables in this same object
- * file, so that programs can link against the config parser
- * without having to link against all the rest of perf.
- */
-#include "cache.h"
-
-int pager_use_color = 1;
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-12-09 16:50 +0100 |
| Message-ID | <qDPaa-1NH-21@gated-at.bofh.it> |
| In reply to | #1286197 |
Em Mon, Dec 07, 2015 at 10:21:43PM -0600, Josh Poimboeuf escreveu:
> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Thanks, applied, trying to go thru the cherry pickable ones in this kit.
- Arnaldo
> ---
> tools/perf/util/Build | 1 -
> tools/perf/util/cache.h | 1 -
> tools/perf/util/color.c | 2 +-
> tools/perf/util/environment.c | 8 --------
> 4 files changed, 1 insertion(+), 11 deletions(-)
> delete mode 100644 tools/perf/util/environment.c
>
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 6c3bbd5..65fef59 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -6,7 +6,6 @@ libperf-y += config.o
> libperf-y += ctype.o
> libperf-y += db-export.o
> libperf-y += env.o
> -libperf-y += environment.o
> libperf-y += event.o
> libperf-y += evlist.o
> libperf-y += evsel.o
> diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
> index c861373..4c2b764 100644
> --- a/tools/perf/util/cache.h
> +++ b/tools/perf/util/cache.h
> @@ -31,7 +31,6 @@ extern const char *perf_config_dirname(const char *, const char *);
> /* pager.c */
> extern void setup_pager(void);
> extern int pager_in_use(void);
> -extern int pager_use_color;
>
> char *alias_lookup(const char *alias);
> int split_cmdline(char *cmdline, const char ***argv);
> diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
> index 9b95654..e5fb88b 100644
> --- a/tools/perf/util/color.c
> +++ b/tools/perf/util/color.c
> @@ -24,7 +24,7 @@ int perf_config_colorbool(const char *var, const char *value, int stdout_is_tty)
> auto_color:
> if (stdout_is_tty < 0)
> stdout_is_tty = isatty(1);
> - if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
> + if (stdout_is_tty || pager_in_use()) {
> char *term = getenv("TERM");
> if (term && strcmp(term, "dumb"))
> return 1;
> diff --git a/tools/perf/util/environment.c b/tools/perf/util/environment.c
> deleted file mode 100644
> index 7405123..0000000
> --- a/tools/perf/util/environment.c
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -/*
> - * We put all the perf config variables in this same object
> - * file, so that programs can link against the config parser
> - * without having to link against all the rest of perf.
> - */
> -#include "cache.h"
> -
> -int pager_use_color = 1;
> --
> 2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for Josh Poimboeuf <tipbot@zytor.com> |
|---|---|
| Date | 2015-12-10 09:20 +0100 |
| Subject | [tip:perf/core] perf tools: Remove unused pager_use_color variable |
| Message-ID | <qE4Ce-3wi-5@gated-at.bofh.it> |
| In reply to | #1286197 |
Commit-ID: de7cf7cadca3a3c32c1f1dbf4593a54f236e2dcf
Gitweb: http://git.kernel.org/tip/de7cf7cadca3a3c32c1f1dbf4593a54f236e2dcf
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Mon, 7 Dec 2015 22:21:43 -0600
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 9 Dec 2015 13:42:02 -0300
perf tools: Remove unused pager_use_color variable
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/e540c61b3068761181db6d9b1b3411990bafdb2f.1449548395.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/Build | 1 -
tools/perf/util/cache.h | 1 -
tools/perf/util/color.c | 2 +-
tools/perf/util/environment.c | 8 --------
4 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 0513dd5..62392ab 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -6,7 +6,6 @@ libperf-y += config.o
libperf-y += ctype.o
libperf-y += db-export.o
libperf-y += env.o
-libperf-y += environment.o
libperf-y += event.o
libperf-y += evlist.o
libperf-y += evsel.o
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index c861373..4c2b764 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -31,7 +31,6 @@ extern const char *perf_config_dirname(const char *, const char *);
/* pager.c */
extern void setup_pager(void);
extern int pager_in_use(void);
-extern int pager_use_color;
char *alias_lookup(const char *alias);
int split_cmdline(char *cmdline, const char ***argv);
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index 9b95654..e5fb88b 100644
--- a/tools/perf/util/color.c
+++ b/tools/perf/util/color.c
@@ -24,7 +24,7 @@ int perf_config_colorbool(const char *var, const char *value, int stdout_is_tty)
auto_color:
if (stdout_is_tty < 0)
stdout_is_tty = isatty(1);
- if (stdout_is_tty || (pager_in_use() && pager_use_color)) {
+ if (stdout_is_tty || pager_in_use()) {
char *term = getenv("TERM");
if (term && strcmp(term, "dumb"))
return 1;
diff --git a/tools/perf/util/environment.c b/tools/perf/util/environment.c
deleted file mode 100644
index 7405123..0000000
--- a/tools/perf/util/environment.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * We put all the perf config variables in this same object
- * file, so that programs can link against the config parser
- * without having to link against all the rest of perf.
- */
-#include "cache.h"
-
-int pager_use_color = 1;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web