leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf probe: Clean up redundant tests in show_line_range()

Browse Source 
It also removes some superflous parentheses.

Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <1292854685-8230-4-git-send-email-fbuihuu@gmail.com>
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Franck Bui-Huu 2010-12-20 15:18:02 +01:00 committed by Arnaldo Carvalho de Melo
parent befe341468
commit 44b81e929b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/perf/util/probe-event.c
View File

@ -373,26 +373,30 @@ int show_line_range(struct line_range *lr, const char *module)
return -errno;
}
/* Skip to starting line number */
while (l < lr->start && ret >= 0)
while (l < lr->start) {
ret = show_one_line(fp, l++, true, false);
if (ret < 0)
goto end;
if (ret < 0)
goto end;
}
list_for_each_entry(ln, &lr->line_list, list) {
while (ln->line > l && ret >= 0)
ret = show_one_line(fp, (l++) - lr->offset,
false, false);
if (ret >= 0)
ret = show_one_line(fp, (l++) - lr->offset,
false, true);
for (; ln->line > l; l++) {
ret = show_one_line(fp, l - lr->offset, false, false);
if (ret < 0)
goto end;
}
ret = show_one_line(fp, l++ - lr->offset, false, true);
if (ret < 0)
goto end;
}
if (lr->end == INT_MAX)
lr->end = l + NR_ADDITIONAL_LINES;
while (l <= lr->end && !feof(fp) && ret >= 0)
ret = show_one_line(fp, (l++) - lr->offset, false, false);
while (l <= lr->end && !feof(fp)) {
ret = show_one_line(fp, l++ - lr->offset, false, false);
if (ret < 0)
break;
}
end:
fclose(fp);
return ret;