perf str{filter,list}: Disentangle headers
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 8ec20b176c4be72d067fa18e33a4f156d1da9bc8 Gitweb: http://git.kernel.org/tip/8ec20b176c4be72d067fa18e33a4f156d1da9bc8 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 18 Apr 2017 10:57:25 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 19 Apr 2017 13:01:52 -0300
perf str{filter,list}: Disentangle headers
There are places where we just need a forward declaration, and others were we need to include strlist.h and/or strfilter.h, reducing the impact of changes in headers on the build time, do it.
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]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-report.c | 1 - tools/perf/builtin-timechart.c | 1 - tools/perf/util/bpf-loader.c | 1 + tools/perf/util/build-id.c | 1 + tools/perf/util/build-id.h | 4 +++- tools/perf/util/evsel_fprintf.c | 1 + tools/perf/util/jitdump.c | 1 - tools/perf/util/map.c | 1 - tools/perf/util/parse-events.c | 1 + tools/perf/util/probe-event.c | 1 + tools/perf/util/probe-event.h | 7 +++++-- tools/perf/util/probe-file.c | 1 + tools/perf/util/probe-file.h | 6 ++++-- tools/perf/util/probe-finder.c | 1 + tools/perf/util/sort.c | 1 + tools/perf/util/sort.h | 1 - tools/perf/util/util.h | 3 ++- 17 files changed, 22 insertions(+), 11 deletions(-)
tools/perf/builtin-report.c +0 -1
@@ -16,7 +16,6 @@#include <linux/rbtree.h> #include "util/symbol.h" #include "util/callchain.h" -#include "util/strlist.h" #include "util/values.h" #include "perf.h"
tools/perf/builtin-timechart.c +0 -1
@@ -30,7 +30,6 @@#include <linux/time64.h> #include "util/symbol.h" #include "util/callchain.h" -#include "util/strlist.h" #include "perf.h" #include "util/header.h"
tools/perf/util/bpf-loader.c +1 -0
@@ -19,6 +19,7 @@#include "probe-event.h" #include "probe-finder.h" // for MAX_PROBES #include "parse-events.h" +#include "strfilter.h" #include "llvm-utils.h" #include "c++/clang-c.h"
tools/perf/util/build-id.c +1 -0
@@ -19,6 +19,7 @@#include "header.h" #include "vdso.h" #include "probe-file.h" +#include "strlist.h" #include "sane_ctype.h"
tools/perf/util/build-id.h +3 -1
@@ -5,7 +5,6 @@#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)#include "tool.h" -#include "strlist.h" #include <linux/types.h> extern struct perf_tool build_id__mark_dso_hit_ops;
@@ -34,6 +33,9 @@ char *build_id_cache__origname(const char *sbuild_id);char *build_id_cache__linkname (const char *sbuild_id,char *bf,size_t size);char *build_id_cache__cachedir (const char *sbuild_id,const char *name,bool is_kallsyms,bool is_vdso); + +struct strlist ; +struct strlist *build_id_cache__list_all (bool validonly);char *build_id_cache__complement (const char *incomplete_sbuild_id); int build_id_cache__list_build_ids(const char *pathname,
tools/perf/util/evsel_fprintf.c +1 -0
@@ -5,6 +5,7 @@#include "evsel.h" #include "callchain.h" #include "map.h" +#include "strlist.h" #include "symbol.h" static int comma_fprintf (FILE *fp,bool *first,const char *fmt, ...)
tools/perf/util/jitdump.c +0 -1
@@ -17,7 +17,6 @@#include "debug.h" #include "evlist.h" #include "symbol.h" -#include "strlist.h" #include <elf.h> #include "tsc.h"
tools/perf/util/map.c +0 -1
@@ -9,7 +9,6 @@#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */ #include "map.h" #include "thread.h" -#include "strlist.h" #include "vdso.h" #include "build-id.h" #include "util.h"
tools/perf/util/parse-events.c +1 -0
@@ -9,6 +9,7 @@#include "parse-events.h" #include <subcmd/exec-cmd.h> #include "string2.h" +#include "strlist.h" #include "symbol.h" #include "cache.h" #include "header.h"
tools/perf/util/probe-event.c +1 -0
@@ -36,6 +36,7 @@#include "util.h" #include "event.h" #include "strlist.h" +#include "strfilter.h" #include "debug.h" #include "cache.h" #include "color.h"
tools/perf/util/probe-event.h +5 -2
@@ -3,8 +3,6 @@#include <stdbool.h> #include "intlist.h" -#include "strlist.h" -#include "strfilter.h" /* Probe related configurations */ struct probe_conf {
@@ -107,6 +105,8 @@ struct line_range {struct intlist *line_list;/* Visible lines */ }; +struct strlist ; +/* List of variables */ struct variable_list {struct probe_trace_point point;/* Actual probepoint */
@@ -153,6 +153,9 @@ int convert_perf_probe_events(struct perf_probe_event *pevs, int npevs);int apply_perf_probe_events (struct perf_probe_event *pevs,int npevs);int show_probe_trace_events (struct perf_probe_event *pevs,int npevs);void cleanup_perf_probe_events (struct perf_probe_event *pevs,int npevs); + +struct strfilter ; +int del_perf_probe_events (struct strfilter *filter); int show_perf_probe_event(const char *group, const char *event,
tools/perf/util/probe-file.c +1 -0
@@ -19,6 +19,7 @@#include "util.h" #include "event.h" #include "strlist.h" +#include "strfilter.h" #include "debug.h" #include "cache.h" #include "color.h"
tools/perf/util/probe-file.h +4 -2
@@ -1,10 +1,11 @@ #ifndef __PROBE_FILE_H #define __PROBE_FILE_H -#include "strlist.h" -#include "strfilter.h" #include "probe-event.h" +struct strlist; +struct strfilter; + /* Cache of probe definitions */ struct probe_cache_entry { struct list_head node;
@@ -41,6 +42,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag);struct strlist *probe_file__get_namelist (int fd);struct strlist *probe_file__get_rawlist (int fd);int probe_file__add_event (int fd,struct probe_trace_event *tev); +int probe_file__del_events (int fd,struct strfilter *filter);int probe_file__get_events (int fd,struct strfilter *filter,struct strlist *plist);
tools/perf/util/probe-finder.c +1 -0
@@ -38,6 +38,7 @@#include "debug.h" #include "intlist.h" #include "util.h" +#include "strlist.h" #include "symbol.h" #include "probe-finder.h" #include "probe-file.h"
tools/perf/util/sort.c +1 -0
@@ -7,6 +7,7 @@#include "symbol.h" #include "evsel.h" #include "evlist.h" +#include "strlist.h" #include <traceevent/event-parse.h> #include "mem-events.h" #include <linux/kernel.h>
tools/perf/util/sort.h +0 -1
@@ -11,7 +11,6 @@#include "symbol.h" #include "string.h" #include "callchain.h" -#include "strlist.h" #include "values.h" #include "../perf.h"
tools/perf/util/util.h +2 -1
@@ -40,7 +40,6 @@#include <termios.h> #include <linux/bitops.h> #include <termios.h> -#include "strlist.h" extern char buildid_dir[];
@@ -89,6 +88,8 @@ static inline void *zalloc(size_t size)#define zfree (ptr) ({ free(*ptr); *ptr = NULL; }) +struct strlist ; +int mkdir_p (char *path,mode_t mode);int rm_rf (const char *path);struct strlist *lsdir (const char *name,bool (*filter)(const char *,struct dirent *));