1 files changed, 38 insertions, 2 deletions

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 1e5e2e5af6b1..57ff826f150b 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -222,7 +222,8 @@ static int perf_parse_file(config_fn_t fn, void *data)
         const unsigned char *bomptr = utf8_bom;
 
         for (;;) {
-                int c = get_next_char();
+                int line, c = get_next_char();
+
                 if (bomptr && *bomptr) {
                         /* We are at the file beginning; skip UTF8-encoded BOM
                          * if present. Sane editors won't put this in on their
@@ -261,8 +262,16 @@ static int perf_parse_file(config_fn_t fn, void *data)
                 if (!isalpha(c))
                         break;
                 var[baselen] = tolower(c);
-                if (get_value(fn, data, var, baselen+1) < 0)
+
+                /*
+                 * The get_value function might or might not reach the '\n',
+                 * so saving the current line number for error reporting.
+                 */
+                line = config_linenr;
+                if (get_value(fn, data, var, baselen+1) < 0) {
+                        config_linenr = line;
                         break;
+                }
         }
         die("bad config file line %d in %s", config_linenr, config_file_name);
 }
@@ -286,6 +295,21 @@ static int parse_unit_factor(const char *end, unsigned long *val)
         return 0;
 }
 
+static int perf_parse_llong(const char *value, long long *ret)
+{
+        if (value && *value) {
+                char *end;
+                long long val = strtoll(value, &end, 0);
+                unsigned long factor = 1;
+
+                if (!parse_unit_factor(end, &factor))
+                        return 0;
+                *ret = val * factor;
+                return 1;
+        }
+        return 0;
+}
+
 static int perf_parse_long(const char *value, long *ret)
 {
         if (value && *value) {
@@ -307,6 +331,15 @@ static void die_bad_config(const char *name)
         die("bad config value for '%s'", name);
 }
 
+u64 perf_config_u64(const char *name, const char *value)
+{
+        long long ret = 0;
+
+        if (!perf_parse_llong(value, &ret))
+                die_bad_config(name);
+        return (u64) ret;
+}
+
 int perf_config_int(const char *name, const char *value)
 {
         long ret = 0;
@@ -372,6 +405,9 @@ int perf_default_config(const char *var, const char *value,
         if (!prefixcmp(var, "ui."))
                 return perf_ui_config(var, value);
 
+        if (!prefixcmp(var, "call-graph."))
+                return perf_callchain_config(var, value);
+
         /* Add other config variables here. */
         return 0;
 }