Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81cb8aa3 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

perf probe: Rename probe finder functions 



Rename *_probepoint to *_probe_point, for nothing
but a cosmetic reason.

Signed-off-by: default avatarMasami 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: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
LKML-Reference: <20100225133534.6725.52615.stgit@localhost6.localdomain6>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3cb8bc6a

tools/perf/builtin-probe.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */

tools/perf/util/probe-finder.c

+6 −6
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ 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,

static void show_probe_point(Dwarf_Die sp_die, Dwarf_Signed offs,

			     struct probe_finder *pf)

{

	struct probe_point *pp = pf->pp;
@@ -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;

tools/perf/util/probe-finder.h

+1 −1
Original line number Diff line number Diff line
@@ -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: */