Messages in this thread | | | Date | Tue, 27 Oct 2020 13:07:45 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf trace beauty: Allow header files in a different path |
| |
Em Thu, Oct 22, 2020 at 07:09:12PM -0700, Ian Rogers escreveu: > On Thu, Oct 22, 2020 at 7:06 PM Namhyung Kim <namhyung@kernel.org> wrote: > > > > Current script to generate mmap flags and prot checks headers from the > > uapi/asm-generic directory but it might come from a different > > directory in some environment. So change the pattern to accept it. > > > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > > Acked-by: Ian Rogers <irogers@google.com>
Thanks, applied.
- Arnaldo
> Thanks, > Ian > > > --- > > tools/perf/trace/beauty/mmap_flags.sh | 4 ++-- > > tools/perf/trace/beauty/mmap_prot.sh | 2 +- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/tools/perf/trace/beauty/mmap_flags.sh b/tools/perf/trace/beauty/mmap_flags.sh > > index 39eb2595983b..76825710c725 100755 > > --- a/tools/perf/trace/beauty/mmap_flags.sh > > +++ b/tools/perf/trace/beauty/mmap_flags.sh > > @@ -28,12 +28,12 @@ egrep -q $regex ${linux_mman} && \ > > egrep -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} ] || egrep -q '#[[:space:]]*include[[:space:]]+<uapi/asm-generic/mman.*' ${arch_mman}) && > > +([ ! -f ${arch_mman} ] || egrep -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) && > > (egrep $regex ${header_dir}/mman-common.h | \ > > egrep -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} ] || egrep -q '#[[:space:]]*include[[:space:]]+<uapi/asm-generic/mman.h>.*' ${arch_mman}) && > > +([ ! -f ${arch_mman} ] || egrep -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.h>.*' ${arch_mman}) && > > (egrep $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") > > diff --git a/tools/perf/trace/beauty/mmap_prot.sh b/tools/perf/trace/beauty/mmap_prot.sh > > index 28f638f8d216..664d8d534a50 100755 > > --- a/tools/perf/trace/beauty/mmap_prot.sh > > +++ b/tools/perf/trace/beauty/mmap_prot.sh > > @@ -17,7 +17,7 @@ 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} ] || egrep -q '#[[:space:]]*include[[:space:]]+<uapi/asm-generic/mman.*' ${arch_mman}) && > > +([ ! -f ${arch_mman} ] || egrep -q '#[[:space:]]*include[[:space:]]+.*uapi/asm-generic/mman.*' ${arch_mman}) && > > (egrep $regex ${common_mman} | \ > > egrep -vw PROT_NONE | \ > > sed -r "s/$regex/\2 \1 \1 \1 \2/g" | \ > > -- > > 2.29.0.rc1.297.gfa9743e501-goog > >
--
- Arnaldo
| |