perf config: Rework buildid_dir_command_config to perf_buildid_config

To avoid repeated calling perf_config() remove
buildid_dir_command_config() and add new perf_buildid_config into
perf_default_config.

Because perf_config() is already called with perf_default_config at
main().

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jiri Olsa <jolsa@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/1459099340-16911-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 4e727635476eadf5b105a7be4620f86a4bf46499..2dd78f4c97a029b71a5f3923125338eeb17652be 100644 (file)
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -377,6 +377,21 @@ const char *perf_config_dirname(const char *name, const char *value)
        return value;
 }
 
+static int perf_buildid_config(const char *var, const char *value)
+{
+       /* same dir for all commands */
+       if (!strcmp(var, "buildid.dir")) {
+               const char *dirname = perf_config_dirname(var, value);
+
+               if (!dirname)
+                       return -1;
+               strncpy(buildid_dir, dirname, MAXPATHLEN-1);
+               buildid_dir[MAXPATHLEN-1] = '\0';
+       }
+
+       return 0;
+}
+
 static int perf_default_core_config(const char *var __maybe_unused,
                                    const char *value __maybe_unused)
 {
@@ -412,6 +427,9 @@ int perf_default_config(const char *var, const char *value,
        if (!prefixcmp(var, "llvm."))
                return perf_llvm_config(var, value);
 
+       if (!prefixcmp(var, "buildid."))
+               return perf_buildid_config(var, value);
+
        /* Add other config variables here. */
        return 0;
 }
@@ -515,43 +533,11 @@ int config_error_nonbool(const char *var)
        return error("Missing value for '%s'", var);
 }
 
-struct buildid_dir_config {
-       char *dir;
-};
-
-static int buildid_dir_command_config(const char *var, const char *value,
-                                     void *data)
-{
-       struct buildid_dir_config *c = data;
-       const char *v;
-
-       /* same dir for all commands */
-       if (!strcmp(var, "buildid.dir")) {
-               v = perf_config_dirname(var, value);
-               if (!v)
-                       return -1;
-               strncpy(c->dir, v, MAXPATHLEN-1);
-               c->dir[MAXPATHLEN-1] = '\0';
-       }
-       return 0;
-}
-
-static void check_buildid_dir_config(void)
-{
-       struct buildid_dir_config c;
-       c.dir = buildid_dir;
-       perf_config(buildid_dir_command_config, &c);
-}
-
 void set_buildid_dir(const char *dir)
 {
        if (dir)
                scnprintf(buildid_dir, MAXPATHLEN-1, "%s", dir);
 
-       /* try config file */
-       if (buildid_dir[0] == '\0')
-               check_buildid_dir_config();
-
        /* default to $HOME/.debug */
        if (buildid_dir[0] == '\0') {
                char *v = getenv("HOME");