perf tools: Don't include terminal handling headers in util.h

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 20, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-20 11:14 UTC #0 lore raw

Commit-ID:  b0742e90f5ab904aa835350c28bcec48e9109379
Gitweb:     http://git.kernel.org/tip/b0742e90f5ab904aa835350c28bcec48e9109379
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 18 Apr 2017 11:08:10 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 19 Apr 2017 13:01:53 -0300

perf tools: Don't include terminal handling headers in util.h

Continuing the disentanglement, mostly the TUI needs CTRL(c), that is in sys/ttydefaults.h and term.c needs the termios headers.

And term.h needs to be added to a few places too.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-kvm.c          | 1 +
 tools/perf/builtin-top.c          | 1 +
 tools/perf/ui/browsers/annotate.c | 1 +
 tools/perf/ui/browsers/header.c   | 2 ++
 tools/perf/ui/browsers/hists.c    | 1 +
 tools/perf/util/parse-events.c    | 2 +-
 tools/perf/util/term.c            | 6 +++++-
 tools/perf/util/util.h            | 4 ----
 8 files changed, 12 insertions(+), 6 deletions(-)

tools/perf/builtin-kvm.c +1 -0

index 4066042..4002277 100644
@@ -3,6 +3,7 @@
 
 #include "util/evsel.h"
 #include "util/evlist.h"
+#include "util/term.h"
 #include "util/util.h"
 #include "util/cache.h"
 #include "util/symbol.h"

tools/perf/builtin-top.c +1 -0

index ec3247d..47984a8 100644
@@ -40,6 +40,7 @@
 #include "util/cpumap.h"
 #include "util/xyarray.h"
 #include "util/sort.h"
+#include "util/term.h"
 #include "util/intlist.h"
 #include "util/parse-branch-options.h"
 #include "arch/common.h"

tools/perf/ui/browsers/annotate.c +1 -0

index 2ed6412..d990ad0 100644
@@ -12,6 +12,7 @@
 #include <inttypes.h>
 #include <pthread.h>
 #include <linux/kernel.h>
+#include <sys/ttydefaults.h>
 
 struct disasm_line_samples {
 	double		percent;

tools/perf/ui/browsers/header.c +2 -0

index edbeaaf..e2c9390 100644
@@ -8,6 +8,8 @@
 #include "util/header.h"
 #include "util/session.h"
 
+#include <sys/ttydefaults.h>
+
 static void ui_browser__argv_write(struct ui_browser *browser,
 				   void *entry, int row)
 {

tools/perf/ui/browsers/hists.c +1 -0

index 0916575..a271b48 100644
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <linux/rbtree.h>
+#include <sys/ttydefaults.h>
 
 #include "../../util/evsel.h"
 #include "../../util/evlist.h"

tools/perf/util/parse-events.c +1 -1

index 580f0e1..f3dd1aa 100644
@@ -1,7 +1,7 @@
 #include <linux/hw_breakpoint.h>
 #include <linux/err.h>
 #include <errno.h>
-#include "util.h"
+#include "term.h"
 #include "../perf.h"
 #include "evlist.h"
 #include "evsel.h"

tools/perf/util/term.c +5 -1

index 90b47d8..8f254a7 100644
@@ -1,4 +1,8 @@
-#include "util.h"
+#include "term.h"
+#include <stdlib.h>
+#include <termios.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
 
 void get_term_dimensions(struct winsize *ws)
 {

tools/perf/util/util.h +0 -4

index 397676c..fa8c2e5 100644
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <term.h>
 #include <limits.h>
 #include <sys/param.h>
 #include <sys/types.h>

@@ -35,11 +34,8 @@
 #include <sys/ioctl.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <sys/ttydefaults.h>
 #include <api/fs/tracing_path.h>
-#include <termios.h>
 #include <linux/bitops.h>
-#include <termios.h>
 
 extern char buildid_dir[];