Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1405886

[PATCH v3 5/7] perf config: Introduce perf_default_config_init()

Show all headers | View raw

default_*_config_init() initialize actual variables
with each default config value.
(e.g. default_colors_config_init() for 'colors' section)

But I suggest using perf_default_config_init() that call
all default_*_config_init() and this function would be called
at the very beginning of main() on perf.c.

In order to set all default config values before running
a particular sub-command. And if we do, we can manage
all default_*_config_init() functions in perf_default_config_init().

Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/perf.c       | 6 ++++++
 tools/perf/ui/browser.c | 1 -
 tools/perf/util/cache.h | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 15982ce..e140b551 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -77,6 +77,11 @@ struct pager_config {
 	int val;
 };
 
+static void perf_default_config_init(void)
+{
+	default_colors_config_init();
+}
+
 static int pager_command_config(const char *var, const char *value, void *data)
 {
 	struct pager_config *c = data;
@@ -558,6 +563,7 @@ int main(int argc, const char **argv)
 
 	srandom(time(NULL));
 
+	perf_default_config_init();
 	perf_config(perf_default_config, NULL);
 	set_buildid_dir(NULL);
 
diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index 00a91e0..c07ca70 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -738,7 +738,6 @@ void ui_browser__init(void)
 {
 	int i = 0;
 
-	default_colors_config_init();
 	perf_config(ui_browser__color_config, NULL);
 
 	while (ui_browser__colorsets[i].name) {
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 54bbd55..19e1e00 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -7,6 +7,7 @@
 #include <subcmd/pager.h>
 #include "../perf.h"
 #include "../ui/ui.h"
+#include "../ui/browser.h"
 #include "config.h"
 
 #include <linux/string.h>
-- 
2.5.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v3 5/7] perf config: Introduce perf_default_config_init() Taeung Song <treeze.taeung@gmail.com> - 2016-05-24 09:00 +0200

csiph-web