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

Commit 8635bf6e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf probe: Remove redundant checks 



While fixing an error propagating problem in f809b25 I added two
redundant checks.

I did that because I didn't expect the checks to be on the while and for
loop condition expression, where they are tested before we run the loop,
where the 'ret' variable is set.

So remove it from there and leave it just after it is actually set,
eliminating unneded tests.

Reported-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e603dc15

tools/perf/util/probe-event.c

+1 −1
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, 
	}



	/* Loop 2: add all events */

	for (i = 0; i < npevs && ret >= 0; i++) {

	for (i = 0; i < npevs; i++) {

		ret = __add_probe_trace_events(pkgs[i].pev, pkgs[i].tevs,

						pkgs[i].ntevs, force_add);

		if (ret < 0)

tools/perf/util/probe-finder.c

+2 −3
Original line number Diff line number Diff line
@@ -1462,8 +1462,7 @@ static int find_probes(int fd, struct probe_finder *pf) 
	off = 0;

	line_list__init(&pf->lcache);

	/* Loop on CUs (Compilation Unit) */

	while (!dwarf_nextcu(dbg, off, &noff, &cuhl, NULL, NULL, NULL) &&

	       ret >= 0) {

	while (!dwarf_nextcu(dbg, off, &noff, &cuhl, NULL, NULL, NULL)) {

		/* Get the DIE(Debugging Information Entry) of this CU */

		diep = dwarf_offdie(dbg, off + cuhl, &pf->cu_die);

		if (!diep)
@@ -1484,7 +1483,7 @@ static int find_probes(int fd, struct probe_finder *pf) 
				pf->lno = pp->line;

				ret = find_probe_point_by_line(pf);

			}

			if (ret != DWARF_CB_OK)

			if (ret < 0)

				break;

		}

		off = noff;