leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: sort_dimension__add shouldn't die

Browse Source 
Propagate error instead.

LKML-Reference: <new-submission>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-04-02 12:30:57 -03:00
parent ad5b217b15
commit 2aefa4f733
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/builtin-report.c
View File

@ -473,7 +473,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
setup_sorting(report_usage, options); setup_sorting(report_usage, options);
if (parent_pattern != default_parent_pattern) { if (parent_pattern != default_parent_pattern) {
sort_dimension__add("parent"); if (sort_dimension__add("parent") < 0)
return -1;
sort_parent.elide = 1; sort_parent.elide = 1;
} else } else
symbol_conf.exclude_other = false; symbol_conf.exclude_other = false;

5
tools/perf/util/sort.c
View File

@ -264,9 +264,8 @@ int sort_dimension__add(const char *tok)
char err[BUFSIZ]; char err[BUFSIZ];
regerror(ret, &parent_regex, err, sizeof(err)); regerror(ret, &parent_regex, err, sizeof(err));
fprintf(stderr, "Invalid regex: %s\n%s", pr_err("Invalid regex: %s\n%s", parent_pattern, err);
parent_pattern, err); return -EINVAL;
exit(-1);
} }
sort__has_parent = 1; sort__has_parent = 1;
} }