aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/probe-finder.c
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2010-03-16 18:05:51 -0400
committerIngo Molnar <mingo@elte.hu>2010-03-17 06:32:30 -0400
commit95a3e4c4e21de1920a2ddb54bfc57c0af7e2561e (patch)
tree8274bfc7c56b7d5ad40dff99bad927eb7b674839 /tools/perf/util/probe-finder.c
parent12a1fadb41b5a6733c36b488b881fb19a28c92d3 (diff)
perf probe: Rename some die_get_* functions
Rename die_get_real_subprogram and die_get_inlinefunc to die_find_real_subprogram and die_find_inlinefunc respectively, because these functions search its children. After that, 'die_get_' means getting a property of that die, and 'die_find_' means searching DIE-tree to get an appropriate child die. Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com> Cc: systemtap <systemtap@sources.redhat.com> Cc: DLE <dle-develop@lists.sourceforge.net> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <20100316220551.32050.36181.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/probe-finder.c')
-rw-r--r--tools/perf/util/probe-finder.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index e887bb6157cd..c91a9605c162 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -204,8 +204,8 @@ static int __die_search_func_cb(Dwarf_Die *fn_die, void *data)
204} 204}
205 205
206/* Search a real subprogram including this line, */ 206/* Search a real subprogram including this line, */
207static Dwarf_Die *die_get_real_subprogram(Dwarf_Die *cu_die, Dwarf_Addr addr, 207static Dwarf_Die *die_find_real_subprogram(Dwarf_Die *cu_die, Dwarf_Addr addr,
208 Dwarf_Die *die_mem) 208 Dwarf_Die *die_mem)
209{ 209{
210 struct __addr_die_search_param ad; 210 struct __addr_die_search_param ad;
211 ad.addr = addr; 211 ad.addr = addr;
@@ -218,8 +218,8 @@ static Dwarf_Die *die_get_real_subprogram(Dwarf_Die *cu_die, Dwarf_Addr addr,
218} 218}
219 219
220/* Similar to dwarf_getfuncs, but returns inlined_subroutine if exists. */ 220/* Similar to dwarf_getfuncs, but returns inlined_subroutine if exists. */
221static Dwarf_Die *die_get_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr, 221static Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
222 Dwarf_Die *die_mem) 222 Dwarf_Die *die_mem)
223{ 223{
224 Dwarf_Die child_die; 224 Dwarf_Die child_die;
225 int ret; 225 int ret;
@@ -233,7 +233,7 @@ static Dwarf_Die *die_get_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
233 dwarf_haspc(die_mem, addr)) 233 dwarf_haspc(die_mem, addr))
234 return die_mem; 234 return die_mem;
235 235
236 if (die_get_inlinefunc(die_mem, addr, &child_die)) { 236 if (die_find_inlinefunc(die_mem, addr, &child_die)) {
237 memcpy(die_mem, &child_die, sizeof(Dwarf_Die)); 237 memcpy(die_mem, &child_die, sizeof(Dwarf_Die));
238 return die_mem; 238 return die_mem;
239 } 239 }
@@ -401,7 +401,7 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
401 401
402 /* If no real subprogram, find a real one */ 402 /* If no real subprogram, find a real one */
403 if (!sp_die || dwarf_tag(sp_die) != DW_TAG_subprogram) { 403 if (!sp_die || dwarf_tag(sp_die) != DW_TAG_subprogram) {
404 sp_die = die_get_real_subprogram(&pf->cu_die, 404 sp_die = die_find_real_subprogram(&pf->cu_die,
405 pf->addr, &die_mem); 405 pf->addr, &die_mem);
406 if (!sp_die) 406 if (!sp_die)
407 die("Probe point is not found in subprograms."); 407 die("Probe point is not found in subprograms.");
@@ -564,7 +564,7 @@ static void find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
564 if (!dwarf_haspc(sp_die, addr)) 564 if (!dwarf_haspc(sp_die, addr))
565 continue; 565 continue;
566 /* Address filtering 2: No child include addr? */ 566 /* Address filtering 2: No child include addr? */
567 if (die_get_inlinefunc(sp_die, addr, &die_mem)) 567 if (die_find_inlinefunc(sp_die, addr, &die_mem))
568 continue; 568 continue;
569 } 569 }
570 570
@@ -714,7 +714,7 @@ static void find_line_range_by_line(Dwarf_Die *sp_die, struct line_finder *lf)
714 continue; 714 continue;
715 715
716 /* Address filtering 2: No child include addr? */ 716 /* Address filtering 2: No child include addr? */
717 if (die_get_inlinefunc(sp_die, addr, &die_mem)) 717 if (die_find_inlinefunc(sp_die, addr, &die_mem))
718 continue; 718 continue;
719 } 719 }
720 720