Skip to content

Commit f703073

Browse files
Yanteng Siacmel
authored andcommitted
perf beauty mmap_flags: Use "test -f" instead of "[-f FILE]"
"[" is part of the shell builtin test (and a synonym for it), not a link to the external command /usr/bin/test. Using the "test" is simpler because it avoids a lot of "[]". Suggested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Yanteng Si <siyanteng@loongson.cn> Acked-by: Huacai Chen <chenhuacai@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: loongarch@lists.linux.dev Cc: loongson-kernel@lists.loongnix.cn Link: https://lore.kernel.org/r/c50bc0a92dce0ff0fa6504c1a52fb53e2ac007bf.1692962043.git.siyanteng@loongson.cn Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 49cf0bf commit f703073

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

tools/perf/trace/beauty/mmap_flags.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ arch_mman=${arch_header_dir}/mman.h
1919

2020
printf "static const char *mmap_flags[] = {\n"
2121
regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+MAP_([[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*'
22-
([ -f ${arch_mman} ] && grep -E -q $regex ${arch_mman}) && \
22+
test -f ${arch_mman} && \
23+
grep -E -q $regex ${arch_mman} && \
2324
(grep -E $regex ${arch_mman} | \
2425
sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \
2526
xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef MAP_%s\n#define MAP_%s %s\n#endif\n")
@@ -28,12 +29,14 @@ grep -E -q $regex ${linux_mman} && \
2829
grep -E -vw 'MAP_(UNINITIALIZED|TYPE|SHARED_VALIDATE)' | \
2930
sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \
3031
xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef MAP_%s\n#define MAP_%s %s\n#endif\n")
31-
([ ! -f ${arch_mman} ] || grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&
32+
( ! test -f ${arch_mman} || \
33+
grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&
3234
(grep -E $regex ${header_dir}/mman-common.h | \
3335
grep -E -vw 'MAP_(UNINITIALIZED|TYPE|SHARED_VALIDATE)' | \
3436
sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \
3537
xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef MAP_%s\n#define MAP_%s %s\n#endif\n")
36-
([ ! -f ${arch_mman} ] || grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.h>.*' ${arch_mman}) &&
38+
( ! test -f ${arch_mman} || \
39+
grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.h>.*' ${arch_mman}) &&
3740
(grep -E $regex ${header_dir}/mman.h | \
3841
sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \
3942
xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef MAP_%s\n#define MAP_%s %s\n#endif\n")

tools/perf/trace/beauty/mmap_prot.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ prefix="PROT"
1717

1818
printf "static const char *mmap_prot[] = {\n"
1919
regex=`printf '^[[:space:]]*#[[:space:]]*define[[:space:]]+%s_([[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*' ${prefix}`
20-
([ ! -f ${arch_mman} ] || grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&
20+
( ! test -f ${arch_mman} \
21+
|| grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&
2122
(grep -E $regex ${common_mman} | \
2223
grep -E -vw PROT_NONE | \
2324
sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \
2425
xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef ${prefix}_%s\n#define ${prefix}_%s %s\n#endif\n")
25-
[ -f ${arch_mman} ] && grep -E -q $regex ${arch_mman} &&
26+
test -f ${arch_mman} && grep -E -q $regex ${arch_mman} &&
2627
(grep -E $regex ${arch_mman} | \
2728
grep -E -vw PROT_NONE | \
2829
sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \

0 commit comments

Comments
 (0)