Commit 88f94112 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

bpftrace.sh: append enums at end of script 



bpftrace scripts do not allow struct definitions after
the first probe definition (including BEGIN/END).
This is problematic for an upcoming patch which will
include some struct defintions.

So instead just add the generated BEGIN/END probes
with enum definitions to the end of the user-specified
script, instead of the beginning.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I7bc8c18c0891ee26edc099aef96ea18ed63ccb72

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9670


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent e8c46796

scripts/bpftrace.sh

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ if [ $# -lt 2 ]; then 
fi

SCRIPTS_DIR=$(readlink -f $(dirname $0))

BIN_PATH=$(readlink -f /proc/$1/exe)

BPF_SCRIPT=$($SCRIPTS_DIR/bpf/gen_enums.sh)

BPF_SCRIPT+=$(sed "s#__EXE__#${BIN_PATH}#g" "${@:2}" | sed "s#__PID__#${1}#g")

BPF_SCRIPT=$(sed "s#__EXE__#${BIN_PATH}#g" "${@:2}" | sed "s#__PID__#${1}#g")

BPF_SCRIPT+=$($SCRIPTS_DIR/bpf/gen_enums.sh)

if [ -n "$ECHO_SCRIPT" ]; then

	echo "$BPF_SCRIPT"

fi