diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2014-04-01 06:47:57 +0200 |
|---|---|---|
| committer | Jiri Olsa <jolsa@redhat.com> | 2014-04-14 12:55:39 +0200 |
| commit | 202c7c123c96a1c193149b7fa2718d7fb143efb2 (patch) | |
| tree | cb851ce23ae95871a5f3601f80cf1bd67cae7dfe /tools | |
| parent | perf tools: Pick up libdw without explicit LIBDW_DIR (diff) | |
| download | linux-202c7c123c96a1c193149b7fa2718d7fb143efb2.tar.xz linux-202c7c123c96a1c193149b7fa2718d7fb143efb2.zip | |
perf probe: Fix --line option behavior
The commit 5a62257a3ddd1 ("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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/probe-finder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index df0238654698..3bf0c8cdccb7 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -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; } |