7610bc38dc
Up until now, importing an SPDK RPC python module was just a matter of `import rpc`. It's fine until there's another module called `rpc` installed on the system, in which case it's impossible to import both of them. Therefore, to avoid this problem, all of the modules were moved to a separate directory under the "spdk" namespace. The decision to move to a location under a separate directory was motivated by the fact that a directory called scripts/spdk would look pretty confusing. Moreover, it should make it also easier to package these scripts as a python package. Other than moving the packages, all of the imports were updated to reflect these changes. Files under python now use relative imports, while those under scripts/ use the "spdk" namespace and have their PYTHONPATH extended with python directory. Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com> Change-Id: Ib43dee73921d590a551dd83885e22870e72451cf Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9692 Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
103 lines
2.5 KiB
Bash
Executable File
103 lines
2.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $testdir/interrupt_common.sh
|
|
|
|
export PYTHONPATH=$PYTHONPATH:$rootdir/examples/interrupt_tgt
|
|
|
|
function reactor_set_intr_mode() {
|
|
local spdk_pid=$1
|
|
local without_thd=$2
|
|
|
|
thd0_ids=($(reactor_get_thread_ids $r0_mask))
|
|
thd2_ids=($(reactor_get_thread_ids $r2_mask))
|
|
|
|
# Number of thd0_ids shouldn't be zero
|
|
if [[ ${#thd0_ids[*]} -eq 0 ]]; then
|
|
echo "spdk_thread is expected in reactor 0."
|
|
return 1
|
|
else
|
|
echo "spdk_thread ids are ${thd0_ids[*]} on reactor0."
|
|
fi
|
|
|
|
# CPU utilization of reactor 0~2 should be idle
|
|
for i in {0..2}; do
|
|
reactor_is_idle $spdk_pid $i
|
|
done
|
|
|
|
if [ "$without_thd"x != x ]; then
|
|
# Schedule all spdk_threads to reactor 1
|
|
for i in ${thd0_ids[*]}; do
|
|
$rpc_py thread_set_cpumask -i $i -m $r1_mask
|
|
done
|
|
for i in ${thd2_ids[*]}; do
|
|
$rpc_py thread_set_cpumask -i $i -m $r1_mask
|
|
done
|
|
fi
|
|
# Set reactor 0 and 2 to be poll mode
|
|
$rpc_py --plugin interrupt_plugin reactor_set_interrupt_mode 0 -d
|
|
$rpc_py --plugin interrupt_plugin reactor_set_interrupt_mode 2 -d
|
|
# CPU utilization of reactor 0 and 2 should be busy
|
|
for i in 0 2; do
|
|
reactor_is_busy $spdk_pid $i
|
|
done
|
|
|
|
# Set reactor 2 back to intr mode
|
|
$rpc_py --plugin interrupt_plugin reactor_set_interrupt_mode 2
|
|
if [ "$without_thd"x != x ]; then
|
|
# Schedule spdk_threads in thd2_ids back to reactor 2
|
|
for i in ${thd2_ids[*]}; do
|
|
$rpc_py thread_set_cpumask -i $i -m $r2_mask
|
|
done
|
|
fi
|
|
# CPU utilization of reactor 2 should be idle
|
|
reactor_is_idle $spdk_pid 2
|
|
|
|
# Set reactor 0 back to intr mode
|
|
$rpc_py --plugin interrupt_plugin reactor_set_interrupt_mode 0
|
|
if [ "$without_thd"x != x ]; then
|
|
# Schedule spdk_threads in thd2_ids back to reactor 0
|
|
for i in ${thd0_ids[*]}; do
|
|
$rpc_py thread_set_cpumask -i $i -m $r0_mask
|
|
done
|
|
fi
|
|
# CPU utilization of reactor 0 should be idle
|
|
reactor_is_idle $spdk_pid 0
|
|
|
|
return 0
|
|
}
|
|
|
|
function reactor_set_mode_without_threads() {
|
|
reactor_set_intr_mode $1 "without_thd"
|
|
return 0
|
|
}
|
|
|
|
function reactor_set_mode_with_threads() {
|
|
reactor_set_intr_mode $1
|
|
return 0
|
|
}
|
|
|
|
# Set reactors with intr_tgt without spdk_thread
|
|
start_intr_tgt
|
|
setup_bdev_mem
|
|
setup_bdev_aio
|
|
|
|
reactor_set_mode_without_threads $intr_tgt_pid
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
killprocess $intr_tgt_pid
|
|
cleanup
|
|
|
|
# Set reactors with intr_tgt with spdk_thread
|
|
start_intr_tgt
|
|
setup_bdev_mem
|
|
setup_bdev_aio
|
|
|
|
reactor_set_mode_with_threads $intr_tgt_pid
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
killprocess $intr_tgt_pid
|
|
cleanup
|