Commit 202c7c12 authored by Namhyung Kim's avatar Namhyung Kim Committed by Jiri Olsa

perf probe: Fix --line option behavior

The commit 5a62257a ("perf probe: Replace line_list with
intlist") replaced line_list to intlist but it has a problem that if a
same line was added again, it'd return -EEXIST rather than 1.

Since line_range_walk_cb() only checks the result being negative, it
resulted in failure or segfault sometimes.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/r/1396327677-3657-1-git-send-email-namhyung@kernel.orgSigned-off-by: default avatarJiri Olsa <jolsa@redhat.com>
parent 2c529e4e
...@@ -1441,13 +1441,15 @@ static int line_range_walk_cb(const char *fname, int lineno, ...@@ -1441,13 +1441,15 @@ static int line_range_walk_cb(const char *fname, int lineno,
void *data) void *data)
{ {
struct line_finder *lf = data; struct line_finder *lf = data;
int err;
if ((strtailcmp(fname, lf->fname) != 0) || if ((strtailcmp(fname, lf->fname) != 0) ||
(lf->lno_s > lineno || lf->lno_e < lineno)) (lf->lno_s > lineno || lf->lno_e < lineno))
return 0; return 0;
if (line_range_add_line(fname, lineno, lf->lr) < 0) err = line_range_add_line(fname, lineno, lf->lr);
return -EINVAL; if (err < 0 && err != -EEXIST)
return err;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment