diff options
-rw-r--r-- | tools/perf/builtin-probe.c | 2 | ||||
-rw-r--r-- | tools/perf/util/probe-finder.c | 12 | ||||
-rw-r--r-- | tools/perf/util/probe-finder.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index c7e14d0145f4..c3e61194f4c6 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c | |||
@@ -314,7 +314,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) | |||
314 | continue; | 314 | continue; |
315 | 315 | ||
316 | lseek(fd, SEEK_SET, 0); | 316 | lseek(fd, SEEK_SET, 0); |
317 | ret = find_probepoint(fd, pp); | 317 | ret = find_probe_point(fd, pp); |
318 | if (ret > 0) | 318 | if (ret > 0) |
319 | continue; | 319 | continue; |
320 | if (ret == 0) { /* No error but failed to find probe point. */ | 320 | if (ret == 0) { /* No error but failed to find probe point. */ |
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 3e10dbe22ab8..c819fd59da9e 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c | |||
@@ -524,8 +524,8 @@ static void free_current_frame_base(struct probe_finder *pf) | |||
524 | } | 524 | } |
525 | 525 | ||
526 | /* Show a probe point to output buffer */ | 526 | /* Show a probe point to output buffer */ |
527 | static void show_probepoint(Dwarf_Die sp_die, Dwarf_Signed offs, | 527 | static void show_probe_point(Dwarf_Die sp_die, Dwarf_Signed offs, |
528 | struct probe_finder *pf) | 528 | struct probe_finder *pf) |
529 | { | 529 | { |
530 | struct probe_point *pp = pf->pp; | 530 | struct probe_point *pp = pf->pp; |
531 | char *name; | 531 | char *name; |
@@ -585,7 +585,7 @@ static int probeaddr_callback(struct die_link *dlink, void *data) | |||
585 | /* Check the address is in this subprogram */ | 585 | /* Check the address is in this subprogram */ |
586 | if (tag == DW_TAG_subprogram && | 586 | if (tag == DW_TAG_subprogram && |
587 | die_within_subprogram(dlink->die, pf->addr, &offs)) { | 587 | die_within_subprogram(dlink->die, pf->addr, &offs)) { |
588 | show_probepoint(dlink->die, offs, pf); | 588 | show_probe_point(dlink->die, offs, pf); |
589 | return 1; | 589 | return 1; |
590 | } | 590 | } |
591 | return 0; | 591 | return 0; |
@@ -668,7 +668,7 @@ static int probefunc_callback(struct die_link *dlink, void *data) | |||
668 | pf->addr = die_get_entrypc(dlink->die); | 668 | pf->addr = die_get_entrypc(dlink->die); |
669 | pf->addr += pp->offset; | 669 | pf->addr += pp->offset; |
670 | /* TODO: Check the address in this function */ | 670 | /* TODO: Check the address in this function */ |
671 | show_probepoint(dlink->die, pp->offset, pf); | 671 | show_probe_point(dlink->die, pp->offset, pf); |
672 | return 1; /* Exit; no same symbol in this CU. */ | 672 | return 1; /* Exit; no same symbol in this CU. */ |
673 | } | 673 | } |
674 | } else if (tag == DW_TAG_inlined_subroutine && pf->inl_offs) { | 674 | } else if (tag == DW_TAG_inlined_subroutine && pf->inl_offs) { |
@@ -691,7 +691,7 @@ found: | |||
691 | /* Get offset from subprogram */ | 691 | /* Get offset from subprogram */ |
692 | ret = die_within_subprogram(lk->die, pf->addr, &offs); | 692 | ret = die_within_subprogram(lk->die, pf->addr, &offs); |
693 | DIE_IF(!ret); | 693 | DIE_IF(!ret); |
694 | show_probepoint(lk->die, offs, pf); | 694 | show_probe_point(lk->die, offs, pf); |
695 | /* Continue to search */ | 695 | /* Continue to search */ |
696 | } | 696 | } |
697 | } | 697 | } |
@@ -704,7 +704,7 @@ static void find_probe_point_by_func(struct probe_finder *pf) | |||
704 | } | 704 | } |
705 | 705 | ||
706 | /* Find a probe point */ | 706 | /* Find a probe point */ |
707 | int find_probepoint(int fd, struct probe_point *pp) | 707 | int find_probe_point(int fd, struct probe_point *pp) |
708 | { | 708 | { |
709 | Dwarf_Half addr_size = 0; | 709 | Dwarf_Half addr_size = 0; |
710 | Dwarf_Unsigned next_cuh = 0; | 710 | Dwarf_Unsigned next_cuh = 0; |
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h index 972b386116f1..b2a25241135a 100644 --- a/tools/perf/util/probe-finder.h +++ b/tools/perf/util/probe-finder.h | |||
@@ -52,7 +52,7 @@ struct line_range { | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | #ifndef NO_LIBDWARF | 54 | #ifndef NO_LIBDWARF |
55 | extern int find_probepoint(int fd, struct probe_point *pp); | 55 | extern int find_probe_point(int fd, struct probe_point *pp); |
56 | extern int find_line_range(int fd, struct line_range *lr); | 56 | extern int find_line_range(int fd, struct line_range *lr); |
57 | 57 | ||
58 | /* Workaround for undefined _MIPS_SZLONG bug in libdwarf.h: */ | 58 | /* Workaround for undefined _MIPS_SZLONG bug in libdwarf.h: */ |