From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754547AbcEXGvk (ORCPT ); Tue, 24 May 2016 02:51:40 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35591 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754421AbcEXGuu (ORCPT ); Tue, 24 May 2016 02:50:50 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Taeung Song , Jiri Olsa , Wang Nan , Ingo Molnar , Masami Hiramatsu Subject: [PATCH v3 5/7] perf config: Introduce perf_default_config_init() Date: Tue, 24 May 2016 15:50:24 +0900 Message-Id: <1464072626-21161-6-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464072626-21161-1-git-send-email-treeze.taeung@gmail.com> References: <1464072626-21161-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Jiri Olsa Cc: Wang Nan Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Alexander Shishkin Signed-off-by: Taeung Song --- 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 #include "../perf.h" #include "../ui/ui.h" +#include "../ui/browser.h" #include "config.h" #include -- 2.5.0