Commit f703073e authored by Yanteng Si's avatar Yanteng Si Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarYanteng Si <siyanteng@loongson.cn>
Acked-by: default avatarHuacai 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 49cf0bf6

tools/perf/trace/beauty/mmap_flags.sh

+6 −3
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ arch_mman=${arch_header_dir}/mman.h 


printf "static const char *mmap_flags[] = {\n"

regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+MAP_([[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*'

([ -f ${arch_mman} ] && grep -E -q $regex ${arch_mman}) && \

test -f ${arch_mman} && \

grep -E -q $regex ${arch_mman} && \

(grep -E $regex ${arch_mman} | \

	sed -r "s/$regex/\2 \1 \1 \1 \2/g"	| \

	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} && \ 
	grep -E -vw 'MAP_(UNINITIALIZED|TYPE|SHARED_VALIDATE)' | \

	sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \

	xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef MAP_%s\n#define MAP_%s %s\n#endif\n")

([ ! -f ${arch_mman} ] || grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&

( ! test -f ${arch_mman} || \

grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&

(grep -E $regex ${header_dir}/mman-common.h | \

	grep -E -vw 'MAP_(UNINITIALIZED|TYPE|SHARED_VALIDATE)' | \

	sed -r "s/$regex/\2 \1 \1 \1 \2/g"	| \

	xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef MAP_%s\n#define MAP_%s %s\n#endif\n")

([ ! -f ${arch_mman} ] || grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.h>.*' ${arch_mman}) &&

( ! test -f ${arch_mman} || \

grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.h>.*' ${arch_mman}) &&

(grep -E $regex ${header_dir}/mman.h | \

	sed -r "s/$regex/\2 \1 \1 \1 \2/g"	| \

	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

+3 −2
Original line number Diff line number Diff line
@@ -17,12 +17,13 @@ prefix="PROT" 


printf "static const char *mmap_prot[] = {\n"

regex=`printf '^[[:space:]]*#[[:space:]]*define[[:space:]]+%s_([[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*' ${prefix}`

([ ! -f ${arch_mman} ] || grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&

( ! test -f ${arch_mman} \

|| grep -E -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) &&

(grep -E $regex ${common_mman} | \

	grep -E -vw PROT_NONE | \

	sed -r "s/$regex/\2 \1 \1 \1 \2/g"	| \

	xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n#ifndef ${prefix}_%s\n#define ${prefix}_%s %s\n#endif\n")

[ -f ${arch_mman} ] && grep -E -q $regex ${arch_mman} &&

test -f ${arch_mman} && grep -E -q $regex ${arch_mman} &&

(grep -E $regex ${arch_mman} | \

	grep -E -vw PROT_NONE | \

	sed -r "s/$regex/\2 \1 \1 \1 \2/g"	| \