Commit cc446446 authored Mar 30, 2011 by Masami Hiramatsu Committed by Arnaldo Carvalho de Melo Apr 05, 2011

perf probe: Fix multiple --vars options behavior



Fix a bug that perf-probe fails to initialize libdwfl and shows incorrect error
when user gives multiple --vars options.

Cc: 2nddept-manager@sdl.hitachi.co.jp
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110330092553.2132.42691.stgit@ltc236.sdl.hitachi.co.jp>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent f0c4801a

tools/perf/util/probe-event.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -510,18 +510,18 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
		if (ret < 0)
		return ret;

		setup_pager();

		for (i = 0; i < npevs && ret >= 0; i++) {
		fd = open_vmlinux(module);
		if (fd < 0) {
		pr_warning("Failed to open debug information file.\n");
		return fd;
		ret = fd;
		break;
		}

		setup_pager();

		for (i = 0; i < npevs && ret >= 0; i++)
		ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
		externs);

		}
		return ret;
		}