diff options
| author | Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> | 2011-06-27 03:27:09 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-07-15 15:55:57 -0400 |
| commit | baad2d3e69ba154dae340904a47ae12414f1894f (patch) | |
| tree | c755b2695300cd8f99ef9d2d570cf85cc1ea2661 /tools | |
| parent | 7f6878a3d707b947603e09d95df0c3a98987e3a4 (diff) | |
perf probe: Rename DIE_FIND_CB_FOUND to DIE_FIND_CB_END
Since die_find/walk* callbacks use DIE_FIND_CB_FOUND for
both of failed and found cases, it should be "END"
instead "FOUND" for avoiding confusion.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reported-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Link: http://lkml.kernel.org/r/20110627072709.6528.45706.stgit@fedora15
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/probe-finder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 3b9d0b800d5c..7b78904a4dba 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c | |||
| @@ -435,7 +435,7 @@ static int die_get_data_member_location(Dwarf_Die *mb_die, Dwarf_Word *offs) | |||
| 435 | 435 | ||
| 436 | /* Return values for die_find callbacks */ | 436 | /* Return values for die_find callbacks */ |
| 437 | enum { | 437 | enum { |
| 438 | DIE_FIND_CB_FOUND = 0, /* End of Search */ | 438 | DIE_FIND_CB_END = 0, /* End of Search */ |
| 439 | DIE_FIND_CB_CHILD = 1, /* Search only children */ | 439 | DIE_FIND_CB_CHILD = 1, /* Search only children */ |
| 440 | DIE_FIND_CB_SIBLING = 2, /* Search only siblings */ | 440 | DIE_FIND_CB_SIBLING = 2, /* Search only siblings */ |
| 441 | DIE_FIND_CB_CONTINUE = 3, /* Search children and siblings */ | 441 | DIE_FIND_CB_CONTINUE = 3, /* Search children and siblings */ |
| @@ -455,7 +455,7 @@ static Dwarf_Die *die_find_child(Dwarf_Die *rt_die, | |||
| 455 | 455 | ||
| 456 | do { | 456 | do { |
| 457 | ret = callback(die_mem, data); | 457 | ret = callback(die_mem, data); |
| 458 | if (ret == DIE_FIND_CB_FOUND) | 458 | if (ret == DIE_FIND_CB_END) |
| 459 | return die_mem; | 459 | return die_mem; |
| 460 | 460 | ||
| 461 | if ((ret & DIE_FIND_CB_CHILD) && | 461 | if ((ret & DIE_FIND_CB_CHILD) && |
| @@ -507,7 +507,7 @@ static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data) | |||
| 507 | 507 | ||
| 508 | if (dwarf_tag(die_mem) == DW_TAG_inlined_subroutine && | 508 | if (dwarf_tag(die_mem) == DW_TAG_inlined_subroutine && |
| 509 | dwarf_haspc(die_mem, *addr)) | 509 | dwarf_haspc(die_mem, *addr)) |
| 510 | return DIE_FIND_CB_FOUND; | 510 | return DIE_FIND_CB_END; |
| 511 | 511 | ||
| 512 | return DIE_FIND_CB_CONTINUE; | 512 | return DIE_FIND_CB_CONTINUE; |
| 513 | } | 513 | } |
| @@ -555,7 +555,7 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data) | |||
| 555 | lw->retval = lw->handler(lw->fname, lineno, addr, | 555 | lw->retval = lw->handler(lw->fname, lineno, addr, |
| 556 | lw->data); | 556 | lw->data); |
| 557 | if (lw->retval != 0) | 557 | if (lw->retval != 0) |
| 558 | return DIE_FIND_CB_FOUND; | 558 | return DIE_FIND_CB_END; |
| 559 | } | 559 | } |
| 560 | } | 560 | } |
| 561 | return DIE_FIND_CB_SIBLING; | 561 | return DIE_FIND_CB_SIBLING; |
| @@ -691,7 +691,7 @@ static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data) | |||
| 691 | if ((tag == DW_TAG_formal_parameter || | 691 | if ((tag == DW_TAG_formal_parameter || |
| 692 | tag == DW_TAG_variable) && | 692 | tag == DW_TAG_variable) && |
| 693 | die_compare_name(die_mem, fvp->name)) | 693 | die_compare_name(die_mem, fvp->name)) |
| 694 | return DIE_FIND_CB_FOUND; | 694 | return DIE_FIND_CB_END; |
| 695 | 695 | ||
| 696 | if (dwarf_haspc(die_mem, fvp->addr)) | 696 | if (dwarf_haspc(die_mem, fvp->addr)) |
| 697 | return DIE_FIND_CB_CONTINUE; | 697 | return DIE_FIND_CB_CONTINUE; |
| @@ -715,7 +715,7 @@ static int __die_find_member_cb(Dwarf_Die *die_mem, void *data) | |||
| 715 | 715 | ||
| 716 | if ((dwarf_tag(die_mem) == DW_TAG_member) && | 716 | if ((dwarf_tag(die_mem) == DW_TAG_member) && |
| 717 | die_compare_name(die_mem, name)) | 717 | die_compare_name(die_mem, name)) |
| 718 | return DIE_FIND_CB_FOUND; | 718 | return DIE_FIND_CB_END; |
| 719 | 719 | ||
| 720 | return DIE_FIND_CB_SIBLING; | 720 | return DIE_FIND_CB_SIBLING; |
| 721 | } | 721 | } |
