perf probe: Fix --line option behavior
The commit 5a62257a3d
("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: Namhyung Kim <namhyung@kernel.org>
Acked-by: Masami 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.org
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
This commit is contained in:
parent
2c529e4e6a
commit
202c7c123c
|
@ -1441,13 +1441,15 @@ static int line_range_walk_cb(const char *fname, int lineno,
|
|||
void *data)
|
||||
{
|
||||
struct line_finder *lf = data;
|
||||
int err;
|
||||
|
||||
if ((strtailcmp(fname, lf->fname) != 0) ||
|
||||
(lf->lno_s > lineno || lf->lno_e < lineno))
|
||||
return 0;
|
||||
|
||||
if (line_range_add_line(fname, lineno, lf->lr) < 0)
|
||||
return -EINVAL;
|
||||
err = line_range_add_line(fname, lineno, lf->lr);
|
||||
if (err < 0 && err != -EEXIST)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue