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

perf probe: Fix to find recursively inlined function



Fix die_find_inlinefunc() to return correct innermost inlined function
at given address. Without this fix, it returns the outermost inlined
function.

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: <20110330092559.2132.78634.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 cc446446

tools/perf/util/probe-finder.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -497,7 +497,20 @@ static int __die_find_inline_cb(Dwarf_Die die_mem, void data)
		static Dwarf_Die die_find_inlinefunc(Dwarf_Die sp_die, Dwarf_Addr addr,
		Dwarf_Die *die_mem)
		{
		return die_find_child(sp_die, __die_find_inline_cb, &addr, die_mem);
		Dwarf_Die tmp_die;

		sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr, &tmp_die);
		if (!sp_die)
		return NULL;

		/* Inlined function could be recursive. Trace it until fail */
		while (sp_die) {
		memcpy(die_mem, sp_die, sizeof(Dwarf_Die));
		sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr,
		&tmp_die);
		}

		return die_mem;
		}

		/* Walker on lines (Note: line number will not be sorted) */