perf tools: Remove string.h, unistd.h and sys/stat.h from util.h

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

Subsystems (3)

perf events Arm/CoreSight framework and drivers Performance events tooling arm64

lore

Share & tools

lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-24 21:15 UTC #0 lore raw

Commit-ID:  7a8ef4c4b5fd5c578da4dadbcb1c5da650426c74
Gitweb:     http://git.kernel.org/tip/7a8ef4c4b5fd5c578da4dadbcb1c5da650426c74
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 19 Apr 2017 20:57:47 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 24 Apr 2017 13:43:33 -0300

perf tools: Remove string.h, unistd.h and sys/stat.h from util.h

Not needed in this header, added to the places that need FILE, putchar(), access() and a few other prototypes.

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

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

---
 tools/lib/subcmd/help.h                 | 1 +
 tools/perf/arch/arm/util/cs-etm.c       | 1 +
 tools/perf/arch/arm64/util/dwarf-regs.c | 1 +
 tools/perf/builtin-help.c               | 4 ++++
 tools/perf/builtin-mem.c                | 3 +++
 tools/perf/builtin-report.c             | 3 +++
 tools/perf/builtin-script.c             | 3 +++
 tools/perf/builtin-stat.c               | 3 +++
 tools/perf/builtin-version.c            | 3 ++-
 tools/perf/perf.c                       | 3 +++
 tools/perf/tests/attr.c                 | 3 +++
 tools/perf/tests/bpf.c                  | 2 ++
 tools/perf/tests/parse-events.c         | 3 +++
 tools/perf/util/build-id.c              | 2 ++
 tools/perf/util/color.h                 | 2 ++
 tools/perf/util/config.c                | 3 +++
 tools/perf/util/dso.c                   | 3 +++
 tools/perf/util/event.c                 | 3 +++
 tools/perf/util/header.c                | 3 +++
 tools/perf/util/machine.c               | 3 +++
 tools/perf/util/pmu.c                   | 1 +
 tools/perf/util/probe-file.c            | 3 +++
 tools/perf/util/strlist.c               | 1 +
 tools/perf/util/util.c                  | 1 +
 tools/perf/util/util.h                  | 3 ---
 25 files changed, 57 insertions(+), 4 deletions(-)

tools/lib/subcmd/help.h +1 -0

index e145a02..9bd4223 100644
@@ -2,6 +2,7 @@
 #define __SUBCMD_HELP_H
 
 #include <sys/types.h>
+#include <stdio.h>
 
 struct cmdnames {
 	size_t alloc;

tools/perf/arch/arm/util/cs-etm.c +1 -0

index dfea6b6..29361d9 100644
@@ -33,6 +33,7 @@
 #include "../../util/cs-etm.h"
 
 #include <stdlib.h>
+#include <sys/stat.h>
 
 #define ENABLE_SINK_MAX	128
 #define CS_BUS_DEVICE_PATH "/bus/coresight/devices/"

tools/perf/arch/arm64/util/dwarf-regs.c +1 -0

index f268720..cd764a9 100644
@@ -10,6 +10,7 @@
 
 #include <errno.h>
 #include <stddef.h>
+#include <string.h>
 #include <dwarf-regs.h>
 #include <linux/ptrace.h> /* for struct user_pt_regs */
 #include <linux/stringify.h>

tools/perf/builtin-help.c +4 -0

index 7bde2f5..492f8e1 100644
@@ -14,6 +14,10 @@
 #include "util/debug.h"
 #include <linux/kernel.h>
 #include <errno.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 static struct man_viewer_list {
 	struct man_viewer_list *next;

tools/perf/builtin-mem.c +3 -0

index 1ebc673..2e5be1d 100644
@@ -1,4 +1,7 @@
 #include <inttypes.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "builtin.h"
 #include "perf.h"

tools/perf/builtin-report.c +3 -0

index 3f89e0e..22478ff 100644
@@ -46,6 +46,9 @@
 #include <signal.h>
 #include <linux/bitmap.h>
 #include <linux/stringify.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 struct report {
 	struct perf_tool	tool;

tools/perf/builtin-script.c +3 -0

index b093a3c..d05aec4 100644
@@ -37,6 +37,9 @@
 #include <inttypes.h>
 #include <signal.h>
 #include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "sane_ctype.h"

tools/perf/builtin-stat.c +3 -0

index e3837fe..eb3cc0b 100644
@@ -76,6 +76,9 @@
 #include <inttypes.h>
 #include <locale.h>
 #include <math.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "sane_ctype.h"

tools/perf/builtin-version.c +2 -1

index b9a095b..d251494 100644
@@ -1,6 +1,7 @@
-#include "util/util.h"
 #include "builtin.h"
 #include "perf.h"
+#include <linux/compiler.h>
+#include <stdio.h>
 
 int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused)
 {

tools/perf/perf.c +3 -0

index 0b2cad0..4cc6960 100644
@@ -24,6 +24,9 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <linux/kernel.h>
 
 const char perf_usage_string[] =

tools/perf/tests/attr.c +3 -0

index c19e0da..0dd77494 100644
@@ -25,6 +25,9 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "../perf.h"
 #include "util.h"
 #include <subcmd/exec-cmd.h>

tools/perf/tests/bpf.c +2 -0

index b78fbd6..5876da1 100644
@@ -1,6 +1,8 @@
 #include <errno.h>
 #include <stdio.h>
 #include <sys/epoll.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <util/util.h>
 #include <util/bpf-loader.h>
 #include <util/evlist.h>

tools/perf/tests/parse-events.c +3 -0

index 981d2bf..7fad885 100644
@@ -7,6 +7,9 @@
 #include "util.h"
 #include <dirent.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <linux/kernel.h>
 #include <linux/hw_breakpoint.h>
 #include <api/fs/fs.h>

tools/perf/util/build-id.c +2 -0

index 923ea29..687b5ad 100644
@@ -10,6 +10,8 @@
 #include <dirent.h>
 #include <errno.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include "build-id.h"
 #include "event.h"
 #include "symbol.h"

tools/perf/util/color.h +2 -0

index a93997f..52122bc 100644
@@ -1,6 +1,8 @@
 #ifndef __PERF_COLOR_H
 #define __PERF_COLOR_H
 
+#include <stdio.h>
+
 /* "\033[1;38;5;2xx;48;5;2xxm\0" is 23 bytes */
 #define COLOR_MAXLEN 24

tools/perf/util/config.c +3 -0

index 07d87d2..8d724f0 100644
@@ -16,6 +16,9 @@
 #include "util/hist.h"  /* perf_hist_config */
 #include "util/llvm-utils.h"   /* perf_llvm_config */
 #include "config.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "sane_ctype.h"

tools/perf/util/dso.c +3 -0

index 3339ab7..a96a99d 100644
@@ -2,6 +2,9 @@
 #include <linux/kernel.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <errno.h>
 #include "compress.h"
 #include "path.h"

tools/perf/util/event.c +3 -0

index cf457ef..2e829ac 100644
@@ -3,6 +3,9 @@
 #include <inttypes.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */
 #include <api/fs/fs.h>
 #include "event.h"

tools/perf/util/header.c +3 -0

index 915bc4f..948b2c5 100644
@@ -11,7 +11,10 @@
 #include <linux/list.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include "evlist.h"
 #include "evsel.h"

tools/perf/util/machine.c +3 -0

index 988e84c..7a47f52 100644
@@ -14,6 +14,9 @@
 #include "thread.h"
 #include "vdso.h"
 #include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "unwind.h"
 #include "linux/hash.h"
 #include "asm/bug.h"

tools/perf/util/pmu.c +1 -0

index bca1844..ac16a9d 100644
@@ -2,6 +2,7 @@
 #include <linux/compiler.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdbool.h>

tools/perf/util/probe-file.c +3 -0

index 685653f..d679389 100644
@@ -15,7 +15,10 @@
  *
  */
 #include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/uio.h>
+#include <unistd.h>
 #include "util.h"
 #include "event.h"
 #include "strlist.h"

tools/perf/util/strlist.c +1 -0

index 0d3dfcb..9de5434 100644
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 static
 struct rb_node *strlist__node_new(struct rblist *rblist, const void *entry)

tools/perf/util/util.c +1 -0

index 131d21a..6450c75 100644
@@ -3,6 +3,7 @@
 #include "debug.h"
 #include <api/fs/fs.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <sys/utsname.h>
 #include <dirent.h>
 #include <inttypes.h>

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

index b8dfbe1..bd883f2 100644
@@ -7,9 +7,6 @@
 #define _DEFAULT_SOURCE 1
 #define HAS_BOOL
 
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stddef.h>