Commit 5ee05b88 authored Jun 06, 2014 by Masami Hiramatsu Committed by Arnaldo Carvalho de Melo Jun 10, 2014

perf probe: Improve error messages in --line option



Improve error messages of 'perf probe --line' mode.

Currently 'perf probe' shows the "Debuginfo analysis failed" message with
an error code when the given symbol is not found:

  -----
  # perf probe -L page_cgroup_init_flatmem
  Debuginfo analysis failed. (-2)
    Error: Failed to show lines.
  -----

But -2 (-ENOENT) means that the given source line or function was not
found. With this patch, 'perf probe' shows the correct error message:

  -----
  # perf probe -L page_cgroup_init_flatmem
  Specified source line is not found.
    Error: Failed to show lines.
  -----

There is also another debug error code is shown in the same function
after get_real_path(). This removes that too.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20140606071406.6788.47850.stgit@kbuild-fedora.novalocal


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 69e96eaa

tools/perf/util/probe-event.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -628,11 +628,11 @@ static int __show_line_range(struct line_range lr, const char module)

		ret = debuginfo__find_line_range(dinfo, lr);
		debuginfo__delete(dinfo);
		if (ret == 0) {
		if (ret == 0 \|\| ret == -ENOENT) {
		pr_warning("Specified source line is not found.\n");
		return -ENOENT;
		} else if (ret < 0) {
		pr_warning("Debuginfo analysis failed. (%d)\n", ret);
		pr_warning("Debuginfo analysis failed.\n");
		return ret;
		}

		@@ -641,7 +641,7 @@ static int __show_line_range(struct line_range lr, const char module)
		ret = get_real_path(tmp, lr->comp_dir, &lr->path);
		free(tmp); /* Free old path */
		if (ret < 0) {
		pr_warning("Failed to find source file. (%d)\n", ret);
		pr_warning("Failed to find source file path.\n");
		return ret;
		}