perf config: Fix abnormal termination at perf_parse_file()

If a config file has wrong key-value pairs, the perf process will be
forcibly terminated by die() at perf_parse_file() called by
perf_config() so terminal settings can be crushed because of unusual
termination.

For example:

If user config file has a wrong value 'red;default' instead of a normal
value like 'red, default' for a key 'colors.top',

    # cat ~/.perfconfig
    [colors]
        medium = red;default # wrong value

and if running sub-command 'top',

    # perf top

perf process is dead by force and terminal setting is broken
with a messge like below.

    Fatal: bad config file line 2 in /root/.perfconfig

So fix it.
If perf_config() can return on failure without calling die()
at perf_parse_file(), this problem can be solved.
And if a config file has wrong values, show the error message
and then use default config values instead of wrong config values.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1465210380-26749-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 dad7d827216816b275112f1cb776396467071663..b50073741b80e91387b333f063a0a46f38c563b9 100644 (file)
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -275,7 +275,8 @@ static int perf_parse_file(config_fn_t fn, void *data)
                        break;
                }
        }
-       die("bad config file line %d in %s", config_linenr, config_file_name);
+       pr_err("bad config file line %d in %s\n", config_linenr, config_file_name);
+       return -1;
 }
 
 static int parse_unit_factor(const char *end, unsigned long *val)
@@ -479,16 +480,15 @@ static int perf_config_global(void)
 
 int perf_config(config_fn_t fn, void *data)
 {
-       int ret = 0, found = 0;
+       int ret = -1;
        const char *home = NULL;
 
        /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
        if (config_exclusive_filename)
                return perf_config_from_file(fn, config_exclusive_filename, data);
        if (perf_config_system() && !access(perf_etc_perfconfig(), R_OK)) {
-               ret += perf_config_from_file(fn, perf_etc_perfconfig(),
-                                           data);
-               found += 1;
+               if (perf_config_from_file(fn, perf_etc_perfconfig(), data) < 0)
+                       goto out;
        }
 
        home = getenv("HOME");
@@ -514,14 +514,12 @@ int perf_config(config_fn_t fn, void *data)
                if (!st.st_size)
                        goto out_free;
 
-               ret += perf_config_from_file(fn, user_config, data);
-               found += 1;
+               ret = perf_config_from_file(fn, user_config, data);
+
 out_free:
                free(user_config);
        }
 out:
-       if (found == 0)
-               return -1;
        return ret;
 }