Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1343996
| From | Wang Nan <wangnan0@huawei.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 03/46] perf config: Bring perf_default_config to the very beginning at main() |
| Date | 2016-02-26 11:00 +0100 |
| Message-ID | <r6nlO-1cF-53@gated-at.bofh.it> (permalink) |
| References | <r6n2p-13D-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Before this patch each subcommand calls perf_config() by themselvs, set
default configuration together with subcommand specific options. If a
subcommand doesn't have it own options, it needs to call
'perf_config(perf_default_config, NULL)' to ensure .perfconfig is
loaded.
This patch brings perf_config(perf_default_config, NULL) to the
very beginning of main(), so subcommand don't need to consider
default options.
After this patch, 'llvm.clang-path' works for 'perf trace'.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: pi3orama@163.com
---
tools/perf/builtin-diff.c | 2 --
tools/perf/builtin-help.c | 2 +-
tools/perf/builtin-kmem.c | 4 ++--
tools/perf/builtin-report.c | 2 +-
tools/perf/builtin-top.c | 4 ++--
tools/perf/perf.c | 2 ++
tools/perf/tests/llvm.c | 8 --------
tools/perf/util/color.c | 5 +++--
tools/perf/util/data-convert-bt.c | 2 +-
tools/perf/util/help-unknown-cmd.c | 5 +++--
10 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 36ccc2b..4d72359 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -1264,8 +1264,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
if (ret < 0)
return ret;
- perf_config(perf_default_config, NULL);
-
argc = parse_options(argc, argv, options, diff_usage, 0);
if (symbol__init(NULL) < 0)
diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index f4dd2b4..49d55e2 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -272,7 +272,7 @@ static int perf_help_config(const char *var, const char *value, void *cb)
if (!prefixcmp(var, "man."))
return add_man_viewer_info(var, value);
- return perf_default_config(var, value, cb);
+ return 0;
}
static struct cmdnames main_cmds, other_cmds;
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 1180105..4d3340c 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1834,7 +1834,7 @@ static int __cmd_record(int argc, const char **argv)
return cmd_record(i, rec_argv, NULL);
}
-static int kmem_config(const char *var, const char *value, void *cb)
+static int kmem_config(const char *var, const char *value, void *cb __maybe_unused)
{
if (!strcmp(var, "kmem.default")) {
if (!strcmp(value, "slab"))
@@ -1847,7 +1847,7 @@ static int kmem_config(const char *var, const char *value, void *cb)
return 0;
}
- return perf_default_config(var, value, cb);
+ return 0;
}
int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index f4d8244..7eea49f 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -90,7 +90,7 @@ static int report__config(const char *var, const char *value, void *cb)
return 0;
}
- return perf_default_config(var, value, cb);
+ return 0;
}
static int hist_iter__report_callback(struct hist_entry_iter *iter,
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index b86b623..94af190 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1065,7 +1065,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
return parse_callchain_top_opt(arg);
}
-static int perf_top_config(const char *var, const char *value, void *cb)
+static int perf_top_config(const char *var, const char *value, void *cb __maybe_unused)
{
if (!strcmp(var, "top.call-graph"))
var = "call-graph.record-mode"; /* fall-through */
@@ -1074,7 +1074,7 @@ static int perf_top_config(const char *var, const char *value, void *cb)
return 0;
}
- return perf_default_config(var, value, cb);
+ return 0;
}
static int
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index f6321194..aaee0a7 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -548,6 +548,8 @@ int main(int argc, const char **argv)
srandom(time(NULL));
+ perf_config(perf_default_config, NULL);
+
/* get debugfs/tracefs mount point from /proc/mounts */
tracing_path_mount();
diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c
index 70edcdf..cff564f 100644
--- a/tools/perf/tests/llvm.c
+++ b/tools/perf/tests/llvm.c
@@ -6,12 +6,6 @@
#include "tests.h"
#include "debug.h"
-static int perf_config_cb(const char *var, const char *val,
- void *arg __maybe_unused)
-{
- return perf_default_config(var, val, arg);
-}
-
#ifdef HAVE_LIBBPF_SUPPORT
static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
{
@@ -77,8 +71,6 @@ test_llvm__fetch_bpf_obj(void **p_obj_buf,
if (should_load_fail)
*should_load_fail = bpf_source_table[idx].should_load_fail;
- perf_config(perf_config_cb, NULL);
-
/*
* Skip this test if user's .perfconfig doesn't set [llvm] section
* and clang is not found in $PATH, and this is not perf test -v
diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c
index e5fb88b..43e84aa 100644
--- a/tools/perf/util/color.c
+++ b/tools/perf/util/color.c
@@ -32,14 +32,15 @@ int perf_config_colorbool(const char *var, const char *value, int stdout_is_tty)
return 0;
}
-int perf_color_default_config(const char *var, const char *value, void *cb)
+int perf_color_default_config(const char *var, const char *value,
+ void *cb __maybe_unused)
{
if (!strcmp(var, "color.ui")) {
perf_use_color_default = perf_config_colorbool(var, value, -1);
return 0;
}
- return perf_default_config(var, value, cb);
+ return 0;
}
static int __color_vsnprintf(char *bf, size_t size, const char *color,
diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
index b722e57..6729f4d 100644
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -1117,7 +1117,7 @@ static int convert__config(const char *var, const char *value, void *cb)
return 0;
}
- return perf_default_config(var, value, cb);
+ return 0;
}
int bt_convert__perf2ctf(const char *input, const char *path, bool force)
diff --git a/tools/perf/util/help-unknown-cmd.c b/tools/perf/util/help-unknown-cmd.c
index dc1e41c..43a98a4 100644
--- a/tools/perf/util/help-unknown-cmd.c
+++ b/tools/perf/util/help-unknown-cmd.c
@@ -6,7 +6,8 @@
static int autocorrect;
static struct cmdnames aliases;
-static int perf_unknown_cmd_config(const char *var, const char *value, void *cb)
+static int perf_unknown_cmd_config(const char *var, const char *value,
+ void *cb __maybe_unused)
{
if (!strcmp(var, "help.autocorrect"))
autocorrect = perf_config_int(var,value);
@@ -14,7 +15,7 @@ static int perf_unknown_cmd_config(const char *var, const char *value, void *cb)
if (!prefixcmp(var, "alias."))
add_cmdname(&aliases, var + 6, strlen(var + 6));
- return perf_default_config(var, value, cb);
+ return 0;
}
static int levenshtein_compare(const void *p1, const void *p2)
--
1.8.3.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/46] perf tools: Fix and improvements (bpf and overwrite) Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:40 +0100
[PATCH 07/46] perf trace: Print content of bpf-output event Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:40 +0100
[tip:perf/core] perf trace: Print content of bpf-output event tip-bot for Wang Nan <tipbot@zytor.com> - 2016-02-27 10:50 +0100
[PATCH 43/46] perf record: Rename variable to make code clear Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:40 +0100
[PATCH 46/46] perf tools: Don't warn about out of order event if write_backward is used Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 26/46] perf record: Disable buildid cache options by default in switch output mode Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 33/46] perf tools: Operate multiple channels Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 24/46] perf record: Split output into multiple files via '--switch-output' Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 45/46] perf record: Allow generate tracking events at the end of output Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 36/46] perf record: Don't poll on overwrite channel Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 30/46] perf record: Prevent reading invalid data in record__mmap_read Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 31/46] perf tools: Add evlist channel helpers Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 35/46] perf record: Don't read from and poll overwrite channel Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 23/46] perf record: Add '--timestamp-filename' option to append timestamp to output filename Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 25/46] perf record: Force enable --timestamp-filename when --switch-output is provided Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 28/46] perf record: Generate tracking events for process forked by perf Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 21/46] perf record: Turns auxtrace_snapshot_enable into 3 states Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 27/46] perf record: Re-synthesize tracking events after output switching Wang Nan <wangnan0@huawei.com> - 2016-02-26 10:50 +0100
[PATCH 12/46] perf core: Prepare writing into ring buffer from end Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 19/46] perf record: Extract synthesize code to record__synthesize() Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 11/46] perf core: Set event's default overflow_handler Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 13/46] perf core: Add backward attribute to perf event Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 18/46] perf record: Use WARN_ONCE to replace 'if' condition Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 20/46] perf tools: Add perf_data_file__switch() helper Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 17/46] perf tools: Make ordered_events reusable Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 14/46] perf core: Reduce perf event output overhead by new overflow handler Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 08/46] perf data: Support converting data from bpf_perf_event_output() Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 10/46] perf core: Introduce new ioctl options to pause and resume ring buffer Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
Re: [PATCH 10/46] perf core: Introduce new ioctl options to pause and resume ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-29 16:40 +0100
Re: [PATCH 10/46] perf core: Introduce new ioctl options to pause and resume ring buffer "Wangnan (F)" <wangnan0@huawei.com> - 2016-03-03 03:20 +0100
[PATCH 09/46] perf data: Explicitly set byte order for integer types Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[PATCH 03/46] perf config: Bring perf_default_config to the very beginning at main() Wang Nan <wangnan0@huawei.com> - 2016-02-26 11:00 +0100
[tip:perf/core] perf config: Bring perf_default_config to the very beginning at main() tip-bot for Wang Nan <tipbot@zytor.com> - 2016-02-27 10:50 +0100
csiph-web