Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211Ab0BWCF3 (ORCPT ); Mon, 22 Feb 2010 21:05:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11358 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753135Ab0BWCFZ (ORCPT ); Mon, 22 Feb 2010 21:05:25 -0500 From: Masami Hiramatsu Subject: [PATCH -tip v3 4/9] perf probe: Rename probe finder functions To: Ingo Molnar , lkml Cc: systemtap , DLE , Masami Hiramatsu , Ingo Molnar , Frederic Weisbecker , Arnaldo Carvalho de Melo , Peter Zijlstra , Paul Mackerras , Mike Galbraith , "K.Prasad" Date: Mon, 22 Feb 2010 21:08:46 -0500 Message-ID: <20100223020846.26668.51610.stgit@localhost6.localdomain6> In-Reply-To: <20100223020818.26668.79685.stgit@localhost6.localdomain6> References: <20100223020818.26668.79685.stgit@localhost6.localdomain6> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3821 Lines: 110 Rename *_probepoint to *_probe_point, for nothing but a cosmetic reason. Signed-off-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad --- tools/perf/builtin-probe.c | 2 +- tools/perf/util/probe-finder.c | 12 ++++++------ 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 c7e14d0..c3e6119 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) continue; lseek(fd, SEEK_SET, 0); - ret = find_probepoint(fd, pp); + ret = find_probe_point(fd, pp); if (ret > 0) continue; 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 3e10dbe..c819fd5 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) } /* Show a probe point to output buffer */ -static void show_probepoint(Dwarf_Die sp_die, Dwarf_Signed offs, - struct probe_finder *pf) +static void show_probe_point(Dwarf_Die sp_die, Dwarf_Signed offs, + struct probe_finder *pf) { struct probe_point *pp = pf->pp; char *name; @@ -585,7 +585,7 @@ static int probeaddr_callback(struct die_link *dlink, void *data) /* Check the address is in this subprogram */ if (tag == DW_TAG_subprogram && die_within_subprogram(dlink->die, pf->addr, &offs)) { - show_probepoint(dlink->die, offs, pf); + show_probe_point(dlink->die, offs, pf); return 1; } return 0; @@ -668,7 +668,7 @@ static int probefunc_callback(struct die_link *dlink, void *data) pf->addr = die_get_entrypc(dlink->die); pf->addr += pp->offset; /* TODO: Check the address in this function */ - show_probepoint(dlink->die, pp->offset, pf); + show_probe_point(dlink->die, pp->offset, pf); return 1; /* Exit; no same symbol in this CU. */ } } else if (tag == DW_TAG_inlined_subroutine && pf->inl_offs) { @@ -691,7 +691,7 @@ found: /* Get offset from subprogram */ ret = die_within_subprogram(lk->die, pf->addr, &offs); DIE_IF(!ret); - show_probepoint(lk->die, offs, pf); + show_probe_point(lk->die, offs, pf); /* Continue to search */ } } @@ -704,7 +704,7 @@ static void find_probe_point_by_func(struct probe_finder *pf) } /* Find a probe point */ -int find_probepoint(int fd, struct probe_point *pp) +int find_probe_point(int fd, struct probe_point *pp) { Dwarf_Half addr_size = 0; Dwarf_Unsigned next_cuh = 0; diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h index 972b386..b2a2524 100644 --- a/tools/perf/util/probe-finder.h +++ b/tools/perf/util/probe-finder.h @@ -52,7 +52,7 @@ struct line_range { }; #ifndef NO_LIBDWARF -extern int find_probepoint(int fd, struct probe_point *pp); +extern int find_probe_point(int fd, struct probe_point *pp); extern int find_line_range(int fd, struct line_range *lr); /* Workaround for undefined _MIPS_SZLONG bug in libdwarf.h: */ -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: mhiramat@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/