Commit 818448e9 authored by Tiezhu Yang's avatar Tiezhu Yang Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Use "grep -E" instead of "egrep" 

The latest version of grep claims the egrep is now obsolete so the build
now contains warnings that look like:

	egrep: warning: egrep is obsolescent; using grep -E

fix this up by moving the related file to use "grep -E" instead.

  sed -i "s/egrep/grep -E/g" `grep egrep -rwl tools/perf`

Here are the steps to install the latest grep:

  wget http://ftp.gnu.org/gnu/grep/grep-3.8.tar.gz


  tar xf grep-3.8.tar.gz
  cd grep-3.8 && ./configure && make
  sudo make install
  export PATH=/usr/local/bin:$PATH

Signed-off-by: default avatarTiezhu Yang <yangtiezhu@loongson.cn>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.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>
Link: http://lore.kernel.org/lkml/1668762999-9297-1-git-send-email-yangtiezhu@loongson.cn


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c587e77e

tools/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ unexport MAKEFLAGS 
# (To override it, run 'make JOBS=1' and similar.)

#

ifeq ($(JOBS),)

  JOBS := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)

  JOBS := $(shell (getconf _NPROCESSORS_ONLN || grep -E -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)

  ifeq ($(JOBS),0)

    JOBS := 1

  endif

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1727,7 +1727,7 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt *arg, struct tep_format_field 
			 len >= 2 && strcmp(field->name + len - 2, "fd") == 0) {

			/*

			 * /sys/kernel/tracing/events/syscalls/sys_enter*

			 * egrep 'field:.*fd;' .../format|sed -r 's/.*field:([a-z ]+) [a-z_]*fd.+/\1/g'|sort|uniq -c

			 * grep -E 'field:.*fd;' .../format|sed -r 's/.*field:([a-z ]+) [a-z_]*fd.+/\1/g'|sort|uniq -c

			 * 65 int

			 * 23 unsigned int

			 * 7 unsigned long

tools/perf/tests/make

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ endif 
PARALLEL_OPT=

ifeq ($(SET_PARALLEL),1)

  ifeq ($(JOBS),)

    cores := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)

    cores := $(shell (getconf _NPROCESSORS_ONLN || grep -E -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)

    ifeq ($(cores),0)

      cores := 1

    endif

tools/perf/tests/shell/lib/probe_vfs_getname.sh

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ cleanup_probe_vfs_getname() { 
add_probe_vfs_getname() {

	local verbose=$1

	if [ $had_vfs_getname -eq 1 ] ; then

		line=$(perf probe -L getname_flags 2>&1 | egrep 'result.*=.*filename;' | sed -r 's/[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*/\1/')

		line=$(perf probe -L getname_flags 2>&1 | grep -E 'result.*=.*filename;' | sed -r 's/[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*/\1/')

		perf probe -q       "vfs_getname=getname_flags:${line} pathname=result->name:string" || \

		perf probe $verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring"

	fi

}



skip_if_no_debuginfo() {

	add_probe_vfs_getname -v 2>&1 | egrep -q "^(Failed to find the path for the kernel|Debuginfo-analysis is not supported)|(file has no debug information)" && return 2

	add_probe_vfs_getname -v 2>&1 | grep -E -q "^(Failed to find the path for the kernel|Debuginfo-analysis is not supported)|(file has no debug information)" && return 2

	return 1

}

tools/perf/tests/shell/record+probe_libc_inet_pton.sh

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ trace_libc_inet_pton_backtrace() { 
	while read line <&3 && read -r pattern <&4; do

		[ -z "$pattern" ] && break

		echo $line

		echo "$line" | egrep -q "$pattern"

		echo "$line" | grep -E -q "$pattern"

		if [ $? -ne 0 ] ; then

			printf "FAIL: expected backtrace entry \"%s\" got \"%s\"\n" "$pattern" "$line"

			return 1