perf config: Move config declarations from util/cache.h to util/config.h
Lately util/config.h has been added but util/cache.h has declarations of functions and a global variable for config features. To manage codes about configuration at one spot, move them to util/config.h and let source files that need config features include config.h And if the source files that included previous cache.h need only config.h, remove including cache.h. Signed-off-by: Taeung Song <treeze.taeung@gmail.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/1466672119-4852-2-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
48d8d5db4a
commit
41840d211c
|
@ -4,7 +4,7 @@
|
||||||
* Builtin help command
|
* Builtin help command
|
||||||
*/
|
*/
|
||||||
#include "perf.h"
|
#include "perf.h"
|
||||||
#include "util/cache.h"
|
#include "util/config.h"
|
||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
#include <subcmd/exec-cmd.h>
|
#include <subcmd/exec-cmd.h>
|
||||||
#include "common-cmds.h"
|
#include "common-cmds.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "util/evlist.h"
|
#include "util/evlist.h"
|
||||||
#include "util/evsel.h"
|
#include "util/evsel.h"
|
||||||
#include "util/util.h"
|
#include "util/util.h"
|
||||||
#include "util/cache.h"
|
#include "util/config.h"
|
||||||
#include "util/symbol.h"
|
#include "util/symbol.h"
|
||||||
#include "util/thread.h"
|
#include "util/thread.h"
|
||||||
#include "util/header.h"
|
#include "util/header.h"
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "util/util.h"
|
#include "util/util.h"
|
||||||
#include <subcmd/parse-options.h>
|
#include <subcmd/parse-options.h>
|
||||||
#include "util/parse-events.h"
|
#include "util/parse-events.h"
|
||||||
|
#include "util/config.h"
|
||||||
|
|
||||||
#include "util/callchain.h"
|
#include "util/callchain.h"
|
||||||
#include "util/cgroup.h"
|
#include "util/cgroup.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
|
|
||||||
#include "util/util.h"
|
#include "util/util.h"
|
||||||
#include "util/cache.h"
|
#include "util/config.h"
|
||||||
|
|
||||||
#include "util/annotate.h"
|
#include "util/annotate.h"
|
||||||
#include "util/color.h"
|
#include "util/color.h"
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "perf.h"
|
#include "perf.h"
|
||||||
|
|
||||||
#include "util/annotate.h"
|
#include "util/annotate.h"
|
||||||
#include "util/cache.h"
|
#include "util/config.h"
|
||||||
#include "util/color.h"
|
#include "util/color.h"
|
||||||
#include "util/evlist.h"
|
#include "util/evlist.h"
|
||||||
#include "util/evsel.h"
|
#include "util/evsel.h"
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include "util/env.h"
|
#include "util/env.h"
|
||||||
#include <subcmd/exec-cmd.h>
|
#include <subcmd/exec-cmd.h>
|
||||||
#include "util/cache.h"
|
#include "util/config.h"
|
||||||
#include "util/quote.h"
|
#include "util/quote.h"
|
||||||
#include <subcmd/run-command.h>
|
#include <subcmd/run-command.h>
|
||||||
#include "util/parse-events.h"
|
#include "util/parse-events.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "../util.h"
|
#include "../util.h"
|
||||||
#include "../cache.h"
|
#include "../config.h"
|
||||||
#include "../../perf.h"
|
#include "../../perf.h"
|
||||||
#include "libslang.h"
|
#include "libslang.h"
|
||||||
#include "ui.h"
|
#include "ui.h"
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "../../util/sort.h"
|
#include "../../util/sort.h"
|
||||||
#include "../../util/symbol.h"
|
#include "../../util/symbol.h"
|
||||||
#include "../../util/evsel.h"
|
#include "../../util/evsel.h"
|
||||||
|
#include "../../util/config.h"
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
struct disasm_line_samples {
|
struct disasm_line_samples {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
static const char *alias_key;
|
static const char *alias_key;
|
||||||
static char *alias_val;
|
static char *alias_val;
|
||||||
|
|
|
@ -18,17 +18,6 @@
|
||||||
#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
|
#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
|
||||||
#define PERF_PAGER_ENVIRONMENT "PERF_PAGER"
|
#define PERF_PAGER_ENVIRONMENT "PERF_PAGER"
|
||||||
|
|
||||||
extern const char *config_exclusive_filename;
|
|
||||||
|
|
||||||
typedef int (*config_fn_t)(const char *, const char *, void *);
|
|
||||||
int perf_default_config(const char *, const char *, void *);
|
|
||||||
int perf_config(config_fn_t fn, void *);
|
|
||||||
int perf_config_int(const char *, const char *);
|
|
||||||
u64 perf_config_u64(const char *, const char *);
|
|
||||||
int perf_config_bool(const char *, const char *);
|
|
||||||
int config_error_nonbool(const char *);
|
|
||||||
const char *perf_etc_perfconfig(void);
|
|
||||||
|
|
||||||
char *alias_lookup(const char *alias);
|
char *alias_lookup(const char *alias);
|
||||||
int split_cmdline(char *cmdline, const char ***argv);
|
int split_cmdline(char *cmdline, const char ***argv);
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
|
#include "config.h"
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,17 @@ struct perf_config_set {
|
||||||
struct list_head sections;
|
struct list_head sections;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern const char *config_exclusive_filename;
|
||||||
|
|
||||||
|
typedef int (*config_fn_t)(const char *, const char *, void *);
|
||||||
|
int perf_default_config(const char *, const char *, void *);
|
||||||
|
int perf_config(config_fn_t fn, void *);
|
||||||
|
int perf_config_int(const char *, const char *);
|
||||||
|
u64 perf_config_u64(const char *, const char *);
|
||||||
|
int perf_config_bool(const char *, const char *);
|
||||||
|
int config_error_nonbool(const char *);
|
||||||
|
const char *perf_etc_perfconfig(void);
|
||||||
|
|
||||||
struct perf_config_set *perf_config_set__new(void);
|
struct perf_config_set *perf_config_set__new(void);
|
||||||
void perf_config_set__delete(struct perf_config_set *set);
|
void perf_config_set__delete(struct perf_config_set *set);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
|
#include "config.h"
|
||||||
#include <subcmd/help.h>
|
#include <subcmd/help.h>
|
||||||
#include "../builtin.h"
|
#include "../builtin.h"
|
||||||
#include "levenshtein.h"
|
#include "levenshtein.h"
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#include "auxtrace.h"
|
#include "auxtrace.h"
|
||||||
#include "tsc.h"
|
#include "tsc.h"
|
||||||
#include "intel-pt.h"
|
#include "intel-pt.h"
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include "intel-pt-decoder/intel-pt-log.h"
|
#include "intel-pt-decoder/intel-pt-log.h"
|
||||||
#include "intel-pt-decoder/intel-pt-decoder.h"
|
#include "intel-pt-decoder/intel-pt-decoder.h"
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "llvm-utils.h"
|
#include "llvm-utils.h"
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#define CLANG_BPF_CMD_DEFAULT_TEMPLATE \
|
#define CLANG_BPF_CMD_DEFAULT_TEMPLATE \
|
||||||
"$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\
|
"$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\
|
||||||
|
|
Loading…
Reference in a new issue