Commit a78d8ea4 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Jim Harris
Browse files

scripts/bpftrace: force basic regex syntax in grep 



Forced grep to use use basic regular expression syntax (-G option) and
removed escape characters from "{", as they're not needed in this mode.
It fixes the following errors:

fatal: command line, 'enum spdk_nvmf_subsystem_state \{': Unmatched \{
fatal: command line, 'enum nvmf_tgt_state \{': Unmatched \{

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I7dd15207d6ff22d229d8f66668d33e0f5596379e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9932


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 143aa5cb

scripts/bpf/gen_enums.sh

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ rootdir=$(git rev-parse --show-toplevel) 
_print_enums() {

	local enum_type=$1 enum_string=$2 enum_prefix=$3 enum output



	output=$(< "$rootdir/$(git -C "$rootdir" grep -l "$enum_string" -- lib module)")

	output=$(< "$rootdir/$(git -C "$rootdir" grep -G -l "$enum_string" -- lib module)")



	# Isolate the enum block

	output=${output#*$enum_string$'\n'} output=${output%%$'\n'\};*}
@@ -34,8 +34,8 @@ print_clear() { printf ' clear(@%s);\n' "${!state_enums[@]}"; } 


declare -A state_enums=() state_prefix=()



state_enums["target"]="enum nvmf_tgt_state \{"

state_enums["subsystem"]="enum spdk_nvmf_subsystem_state \{"

state_enums["target"]="enum nvmf_tgt_state {"

state_enums["subsystem"]="enum spdk_nvmf_subsystem_state {"

state_prefix["target"]=NVMF_TGT_

state_prefix["subsystem"]=SPDK_NVMF_SUBSYSTEM_