From 1fafd71bc38161b29c6fca1e0bec3aa637e80c6a Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 4 Dec 2019 13:47:50 -0700 Subject: [PATCH] test: add timing calls to run_test And clean out the corresponding calls to timing_enter and timing_exit from the various test scripts. Change-Id: I0759417b5a529e4c3649ce04cca1799c089da278 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476804 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris Community-CI: Broadcom SPDK FC-NVMe CI --- autotest.sh | 4 --- test/bdev/bdev_raid.sh | 2 -- test/bdev/blockdev.sh | 3 -- test/blobfs/blobfs.sh | 4 --- test/blobfs/rocksdb/rocksdb.sh | 3 -- test/blobstore/blob_io_wait/blob_io_wait.sh | 3 -- test/blobstore/blobstore.sh | 4 --- test/common/autotest_common.sh | 4 +++ test/compress/compress.sh | 2 -- test/env/env.sh | 3 -- test/event/event.sh | 2 -- test/ftl/ftl.sh | 17 ----------- test/ioat/ioat.sh | 3 -- test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh | 3 -- test/iscsi_tgt/calsoft/calsoft.sh | 3 -- test/iscsi_tgt/digests/digests.sh | 3 -- test/iscsi_tgt/ext4test/ext4test.sh | 3 -- test/iscsi_tgt/filesystem/filesystem.sh | 3 -- test/iscsi_tgt/fio/fio.sh | 4 --- test/iscsi_tgt/initiator/initiator.sh | 3 -- test/iscsi_tgt/ip_migration/ip_migration.sh | 3 -- test/iscsi_tgt/iscsi_tgt.sh | 3 -- test/iscsi_tgt/lvol/iscsi_lvol.sh | 3 -- .../multiconnection/multiconnection.sh | 3 -- test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh | 3 -- test/iscsi_tgt/pmem/iscsi_pmem.sh | 3 -- test/iscsi_tgt/qos/qos.sh | 3 -- test/iscsi_tgt/rbd/rbd.sh | 3 -- test/iscsi_tgt/reset/reset.sh | 3 -- test/iscsi_tgt/rpc_config/rpc_config.sh | 4 --- test/iscsi_tgt/trace_record/trace_record.sh | 3 -- test/nvme/hotplug.sh | 4 --- test/nvme/nvme.sh | 4 --- test/nvme/spdk_nvme_cli.sh | 3 -- test/nvme/spdk_nvme_cli_cuse.sh | 3 -- test/nvmf/host/aer.sh | 2 -- test/nvmf/host/bdevperf.sh | 3 -- test/nvmf/host/fio.sh | 2 -- test/nvmf/host/identify.sh | 2 -- test/nvmf/host/identify_kernel_nvmf.sh | 3 -- test/nvmf/host/perf.sh | 3 -- test/nvmf/host/target_disconnect.sh | 4 --- test/nvmf/nvmf.sh | 3 -- test/nvmf/target/bdev_io_wait.sh | 2 -- test/nvmf/target/bdevio.sh | 2 -- test/nvmf/target/connect_disconnect.sh | 3 -- test/nvmf/target/create_transport.sh | 2 -- test/nvmf/target/discovery.sh | 2 -- test/nvmf/target/filesystem.sh | 3 -- test/nvmf/target/fio.sh | 2 -- test/nvmf/target/fuzz.sh | 3 -- test/nvmf/target/initiator_timeout.sh | 2 -- test/nvmf/target/multiconnection.sh | 2 -- test/nvmf/target/multitarget.sh | 2 -- test/nvmf/target/nmic.sh | 2 -- test/nvmf/target/nvme_cli.sh | 2 -- test/nvmf/target/nvmf_lvol.sh | 2 -- test/nvmf/target/nvmf_vhost.sh | 2 -- test/nvmf/target/rpc.sh | 2 -- test/nvmf/target/shutdown.sh | 2 -- test/nvmf/target/srq_overwhelm.sh | 2 -- test/ocf/ocf.sh | 5 ---- test/pmem/pmem.sh | 2 -- test/rpc_client/rpc_client.sh | 2 -- test/spdkcli/iscsi.sh | 2 -- test/spdkcli/nvmf.sh | 2 -- test/spdkcli/pmem.sh | 2 -- test/spdkcli/raid.sh | 2 -- test/spdkcli/rbd.sh | 2 -- test/spdkcli/tcp.sh | 3 -- test/spdkcli/vhost.sh | 2 -- test/spdkcli/virtio.sh | 3 -- test/vhost/fuzz/fuzz.sh | 4 --- test/vhost/vhost.sh | 29 ------------------- test/vhost/vhost_boot/vhost_boot.sh | 3 -- test/vmd/vmd.sh | 4 --- 76 files changed, 4 insertions(+), 248 deletions(-) diff --git a/autotest.sh b/autotest.sh index 230f5b9a2..015f73ae8 100755 --- a/autotest.sh +++ b/autotest.sh @@ -144,10 +144,8 @@ fi ##################### if [ $SPDK_TEST_UNITTEST -eq 1 ]; then - timing_enter unittest run_test suite "unittest" ./test/unit/unittest.sh report_test_completion "unittest" - timing_exit unittest fi @@ -223,12 +221,10 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then fi if [ $SPDK_TEST_LVOL -eq 1 ]; then - timing_enter lvol run_test suite "lvol" ./test/lvol/lvol.sh --test-cases=all run_test suite "lvol2" ./test/lvol/lvol2.sh run_test suite "blob_io_wait" ./test/blobstore/blob_io_wait/blob_io_wait.sh report_test_completion "lvol" - timing_exit lvol fi if [ $SPDK_TEST_VHOST_INIT -eq 1 ]; then diff --git a/test/bdev/bdev_raid.sh b/test/bdev/bdev_raid.sh index bce528117..21683996e 100755 --- a/test/bdev/bdev_raid.sh +++ b/test/bdev/bdev_raid.sh @@ -112,11 +112,9 @@ function raid_function_test() { return 0 } -timing_enter bdev_raid trap 'on_error_exit;' ERR raid_function_test rm -f $tmp_file report_test_completion "bdev_raid" -timing_exit bdev_raid diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh index 1235aa326..c99860849 100755 --- a/test/bdev/blockdev.sh +++ b/test/bdev/blockdev.sh @@ -143,8 +143,6 @@ function qos_function_test() { fi } -timing_enter bdev - # Create a file to be used as an AIO backend dd if=/dev/zero of=/tmp/aiofile bs=2048 count=5000 @@ -301,4 +299,3 @@ rm -f /tmp/spdk-pmem-pool rm -f $testdir/bdev.conf rbd_cleanup report_test_completion "bdev" -timing_exit bdev diff --git a/test/blobfs/blobfs.sh b/test/blobfs/blobfs.sh index 492775d0b..473e3d398 100755 --- a/test/blobfs/blobfs.sh +++ b/test/blobfs/blobfs.sh @@ -122,8 +122,6 @@ function blobfs_fuse_test() { killprocess $blobfs_pid } -timing_enter blobfs - trap 'on_error_exit;' ERR # Create one temp file as test bdev @@ -146,5 +144,3 @@ blobfs_fuse_test rm -rf $mount_dir rm -f $tmp_file report_test_completion "blobfs" - -timing_exit blobfs diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index 8e102e643..32f587c7c 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -39,8 +39,6 @@ if [ ! -e $DB_BENCH_DIR ]; then exit 0 fi -timing_enter rocksdb - timing_enter db_bench_build pushd $DB_BENCH_DIR @@ -154,4 +152,3 @@ run_bsdump rm -f $ROCKSDB_CONF report_test_completion "blobfs" -timing_exit rocksdb diff --git a/test/blobstore/blob_io_wait/blob_io_wait.sh b/test/blobstore/blob_io_wait/blob_io_wait.sh index d6384e6ff..3fe8c95d7 100755 --- a/test/blobstore/blob_io_wait/blob_io_wait.sh +++ b/test/blobstore/blob_io_wait/blob_io_wait.sh @@ -12,8 +12,6 @@ source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh rpc_py="$rootdir/scripts/rpc.py" -timing_enter blob_bdev_io_wait - truncate -s 64M $testdir/aio.bdev $rootdir/test/app/bdev_svc/bdev_svc & @@ -63,4 +61,3 @@ rm -rf $testdir/aio.bdev trap - SIGINT SIGTERM EXIT report_test_completion "blob_io_wait" -timing_exit bdev_io_wait diff --git a/test/blobstore/blobstore.sh b/test/blobstore/blobstore.sh index 3afb73194..66b6b1a67 100755 --- a/test/blobstore/blobstore.sh +++ b/test/blobstore/blobstore.sh @@ -10,8 +10,6 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh -timing_enter blobstore - # Nvme0 target configuration $rootdir/scripts/gen_nvme.sh > $testdir/blobcli.conf @@ -33,5 +31,3 @@ rm -rf $testdir/btest.out rm -rf $testdir/blobcli.conf rm -rf $testdir/*.blob rm -rf $testdir/test.pattern - -timing_exit blobstore diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index d54b31149..f790a9c8f 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -575,6 +575,8 @@ function run_test() { shift local test_name="$1" shift + + timing_enter $test_name echo "************************************" echo "START TEST $test_type $test_name" echo "************************************" @@ -584,6 +586,8 @@ function run_test() { echo "************************************" echo "END TEST $test_type $test_name" echo "************************************" + + timing_exit $test_name xtrace_restore } diff --git a/test/compress/compress.sh b/test/compress/compress.sh index d3b6d3f39..23495f25d 100755 --- a/test/compress/compress.sh +++ b/test/compress/compress.sh @@ -73,7 +73,6 @@ function run_bdevperf() { killprocess $bdevperf_pid } -timing_enter compress_test mkdir -p /tmp/pmem # per patch bdevperf uses slightly different params than nightly @@ -110,4 +109,3 @@ if [ $RUN_NIGHTLY -eq 1 ]; then fi rm -rf /tmp/pmem -timing_exit compress_test diff --git a/test/env/env.sh b/test/env/env.sh index 74660f67b..22ff87db2 100755 --- a/test/env/env.sh +++ b/test/env/env.sh @@ -4,8 +4,6 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh -timing_enter env - timing_enter memory $testdir/memory/memory_ut timing_exit memory @@ -41,4 +39,3 @@ if [ $(uname) = Linux ]; then fi report_test_completion "env" -timing_exit env diff --git a/test/event/event.sh b/test/event/event.sh index e1d080b13..4b33df1fe 100755 --- a/test/event/event.sh +++ b/test/event/event.sh @@ -4,9 +4,7 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh -timing_enter event $testdir/event_perf/event_perf -m 0xF -t 1 $testdir/reactor/reactor -t 1 $testdir/reactor_perf/reactor_perf -t 1 report_test_completion "event" -timing_exit event diff --git a/test/ftl/ftl.sh b/test/ftl/ftl.sh index aa1944046..457422a51 100755 --- a/test/ftl/ftl.sh +++ b/test/ftl/ftl.sh @@ -45,34 +45,21 @@ if [ -z "$nv_cache" ]; then echo "Couldn't find NVMe device to be used as non-volatile cache" fi -timing_enter ftl -timing_enter bdevperf - run_test suite "ftl_bdevperf" $testdir/bdevperf.sh $device -timing_exit bdevperf - -timing_enter restore run_test suite "ftl_restore" $testdir/restore.sh $device if [ -n "$nv_cache" ]; then run_test suite "ftl_restore_nv_cache" $testdir/restore.sh -c $nv_cache $device fi -timing_exit restore if [ -n "$nv_cache" ]; then - timing_enter dirty_shutdown run_test suite "ftl_dirty_shutdown" $testdir/dirty_shutdown.sh -c $nv_cache $device - timing_exit dirty_shutdown fi -timing_enter json run_test suite "ftl_json" $testdir/json.sh $device -timing_exit json if [ $SPDK_TEST_FTL_EXTENDED -eq 1 ]; then - timing_enter fio_basic run_test suite "ftl_fio_basic" $testdir/fio.sh $device basic - timing_exit fio_basic $rootdir/app/spdk_tgt/spdk_tgt & svc_pid=$! @@ -85,9 +72,5 @@ if [ $SPDK_TEST_FTL_EXTENDED -eq 1 ]; then trap - SIGINT SIGTERM EXIT - timing_enter fio_extended run_test suite "ftl_fio_extended" $testdir/fio.sh $device extended $uuid - timing_exit fio_extended fi - -timing_exit ftl diff --git a/test/ioat/ioat.sh b/test/ioat/ioat.sh index aafec5c5c..1a43fd9dd 100755 --- a/test/ioat/ioat.sh +++ b/test/ioat/ioat.sh @@ -4,8 +4,6 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh -timing_enter ioat - timing_enter perf $rootdir/examples/ioat/perf/ioat_perf -t 1 timing_exit perf @@ -15,4 +13,3 @@ $rootdir/examples/ioat/verify/verify -t 1 timing_exit verify report_test_completion "ioat" -timing_exit ioat diff --git a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh index a6970b22c..959d3b140 100755 --- a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh +++ b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh @@ -7,8 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh iscsitestinit $1 $2 -timing_enter bdev_io_wait - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 @@ -55,4 +53,3 @@ killprocess $pid iscsitestfini $1 $2 report_test_completion "bdev_io_wait" -timing_exit bdev_io_wait diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index 16d4d21ab..a80bb3cb4 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -13,8 +13,6 @@ if [ ! -d /usr/local/calsoft ]; then exit 0 fi -timing_enter calsoft - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 @@ -67,5 +65,4 @@ trap - SIGINT SIGTERM EXIT killprocess $pid delete_tmp_conf_files -timing_exit calsoft exit $failed diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh index d6f5e497e..15aab4d2a 100755 --- a/test/iscsi_tgt/digests/digests.sh +++ b/test/iscsi_tgt/digests/digests.sh @@ -57,8 +57,6 @@ function iscsi_header_data_digest_test() { timing_exit both_enabled } -timing_enter digests - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 @@ -106,4 +104,3 @@ trap - SIGINT SIGTERM EXIT iscsicleanup killprocess $pid iscsitestfini $1 $2 -timing_exit digests diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh index 3302b6209..7e8f828a6 100755 --- a/test/iscsi_tgt/ext4test/ext4test.sh +++ b/test/iscsi_tgt/ext4test/ext4test.sh @@ -9,8 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh # $2 = test type posix or vpp. defaults to posix. iscsitestinit $1 $2 -timing_enter ext4test - rpc_py="$rootdir/scripts/rpc.py" node_base="iqn.2013-06.com.intel.ch.spdk" @@ -132,4 +130,3 @@ fi killprocess $pid iscsitestfini $1 $2 report_test_completion "nightly_iscsi_ext4test" -timing_exit ext4test diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh index e8cd778c3..b0e9029f9 100755 --- a/test/iscsi_tgt/filesystem/filesystem.sh +++ b/test/iscsi_tgt/filesystem/filesystem.sh @@ -10,8 +10,6 @@ source $rootdir/scripts/common.sh # $2 = test type posix or vpp. defaults to posix. iscsitestinit $1 $2 -timing_enter filesystem - rpc_py="$rootdir/scripts/rpc.py" # Remove lvol bdevs and stores. function remove_backends() { @@ -144,4 +142,3 @@ iscsicleanup remove_backends killprocess $pid iscsitestfini $1 $2 -timing_exit filesystem diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index bff2dfc90..eaa3c6165 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -54,8 +54,6 @@ if [ -z "$INITIATOR_IP" ]; then exit 1 fi -timing_enter fio - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=4096 @@ -151,5 +149,3 @@ trap - SIGINT SIGTERM EXIT killprocess $pid iscsitestfini $1 $2 - -timing_exit fio diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh index 9d149f890..f7c05d324 100755 --- a/test/iscsi_tgt/initiator/initiator.sh +++ b/test/iscsi_tgt/initiator/initiator.sh @@ -9,8 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh # $2 = test type posix or vpp. defaults to posix. iscsitestinit $1 $2 -timing_enter initiator - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 @@ -57,4 +55,3 @@ killprocess $pid iscsitestfini $1 $2 report_test_completion "iscsi_initiator" -timing_exit initiator diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index 29f762752..956b78ac6 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -75,8 +75,6 @@ function rpc_add_target_node() { $rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS } -timing_enter ip_migration - echo "Running ip migration tests" for ((i = 0; i < 2; i++)); do timing_enter start_iscsi_tgt_$i @@ -130,4 +128,3 @@ iscsicleanup $rpc_py -s $rpc_second_addr spdk_kill_instance SIGTERM iscsitestfini $1 $2 report_test_completion "iscsi_ip_migration" -timing_exit ip_migration diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh index 9a24c239a..9bb5a4e64 100755 --- a/test/iscsi_tgt/iscsi_tgt.sh +++ b/test/iscsi_tgt/iscsi_tgt.sh @@ -9,8 +9,6 @@ fi source $rootdir/test/iscsi_tgt/common.sh -timing_enter iscsi_tgt - # $1 = test type (posix/vpp) if [ "$1" == "posix" ] || [ "$1" == "vpp" ]; then TEST_TYPE=$1 @@ -82,4 +80,3 @@ fi cleanup_veth_interfaces $TEST_TYPE trap - SIGINT SIGTERM EXIT -timing_exit iscsi_tgt diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh index a54c40755..86f53cecb 100755 --- a/test/iscsi_tgt/lvol/iscsi_lvol.sh +++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh @@ -9,8 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh # $2 = test type posix or vpp. defaults to posix. iscsitestinit $1 $2 -timing_enter iscsi_lvol - MALLOC_BDEV_SIZE=128 MALLOC_BLOCK_SIZE=512 if [ $RUN_NIGHTLY -eq 1 ]; then @@ -85,4 +83,3 @@ rm -f ./local-job* iscsicleanup killprocess $pid iscsitestfini $1 $2 -timing_exit iscsi_lvol diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh index 0eb09b651..fe5eaa6dc 100755 --- a/test/iscsi_tgt/multiconnection/multiconnection.sh +++ b/test/iscsi_tgt/multiconnection/multiconnection.sh @@ -34,8 +34,6 @@ function remove_backends() { return 0 } -timing_enter multiconnection - timing_enter start_iscsi_tgt $ISCSI_APP --wait-for-rpc & iscsipid=$! @@ -84,4 +82,3 @@ iscsicleanup remove_backends killprocess $iscsipid iscsitestfini $1 $2 -timing_exit multiconnection diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh index 49483f028..7ccf07d1d 100755 --- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh +++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh @@ -53,8 +53,6 @@ function run_nvme_remote() { iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT } -timing_enter nvme_remote - # Start the NVMf target NVMF_APP="$rootdir/app/nvmf_tgt/nvmf_tgt" $NVMF_APP -m 0x2 -p 1 -s 512 --wait-for-rpc & @@ -102,4 +100,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 report_test_completion "iscsi_nvme_remote" iscsitestfini $1 $2 nvmftestfini -timing_exit nvme_remote diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh index 6e679b924..7ad873d3d 100755 --- a/test/iscsi_tgt/pmem/iscsi_pmem.sh +++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh @@ -15,8 +15,6 @@ PMEM_PER_TGT=1 rpc_py="$rootdir/scripts/rpc.py" fio_py="$rootdir/scripts/fio.py" -timing_enter iscsi_pmem - timing_enter start_iscsi_target $ISCSI_APP -m $ISCSI_TEST_CORE_MASK --wait-for-rpc & pid=$! @@ -75,4 +73,3 @@ rm -f ./local-job* rm -f /tmp/pool_file* killprocess $pid report_test_completion "nightly_iscsi_pmem" -timing_exit iscsi_pmem diff --git a/test/iscsi_tgt/qos/qos.sh b/test/iscsi_tgt/qos/qos.sh index a61dd0d9f..e10c7b3bc 100755 --- a/test/iscsi_tgt/qos/qos.sh +++ b/test/iscsi_tgt/qos/qos.sh @@ -50,8 +50,6 @@ if [ -z "$INITIATOR_IP" ]; then exit 1 fi -timing_enter qos - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 IOPS_RESULT= @@ -145,4 +143,3 @@ trap - SIGINT SIGTERM EXIT killprocess $pid iscsitestfini $1 $2 -timing_exit qos diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh index 67b267a9b..08877280e 100755 --- a/test/iscsi_tgt/rbd/rbd.sh +++ b/test/iscsi_tgt/rbd/rbd.sh @@ -19,8 +19,6 @@ rbd_setup $TARGET_IP $TARGET_NAMESPACE trap 'rbd_cleanup; exit 1' SIGINT SIGTERM EXIT timing_exit rbd_setup -timing_enter rbd - rpc_py="$rootdir/scripts/rpc.py" fio_py="$rootdir/scripts/fio.py" @@ -68,4 +66,3 @@ rbd_cleanup iscsitestfini $1 $2 report_test_completion "iscsi_rbd" -timing_exit rbd diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh index e112216a0..16fb8884f 100755 --- a/test/iscsi_tgt/reset/reset.sh +++ b/test/iscsi_tgt/reset/reset.sh @@ -9,8 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh # $2 = test type posix or vpp. defaults to posix. iscsitestinit $1 $2 -timing_enter reset - MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 @@ -77,4 +75,3 @@ trap - SIGINT SIGTERM EXIT iscsicleanup killprocess $pid iscsitestfini $1 $2 -timing_exit reset diff --git a/test/iscsi_tgt/rpc_config/rpc_config.sh b/test/iscsi_tgt/rpc_config/rpc_config.sh index 6ca42074f..ab608c331 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.sh +++ b/test/iscsi_tgt/rpc_config/rpc_config.sh @@ -9,8 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh # $2 = "iso" - triggers isolation mode (setting up required environment). iscsitestinit $2 $1 -timing_enter rpc_config - if [ "$1" == "posix" ] || [ "$1" == "vpp" ]; then TEST_TYPE=$1 else @@ -63,5 +61,3 @@ iscsicleanup killprocess $pid iscsitestfini $2 $1 - -timing_exit rpc_config diff --git a/test/iscsi_tgt/trace_record/trace_record.sh b/test/iscsi_tgt/trace_record/trace_record.sh index 75dd19d97..0f390f864 100755 --- a/test/iscsi_tgt/trace_record/trace_record.sh +++ b/test/iscsi_tgt/trace_record/trace_record.sh @@ -28,8 +28,6 @@ if [ -z "$INITIATOR_IP" ]; then exit 1 fi -timing_enter trace_record - NUM_TRACE_ENTRIES=4096 MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=4096 @@ -135,4 +133,3 @@ done trap - SIGINT SIGTERM EXIT iscsitestfini $1 $2 -timing_exit trace_record diff --git a/test/nvme/hotplug.sh b/test/nvme/hotplug.sh index fbdb14884..6a771f6c3 100755 --- a/test/nvme/hotplug.sh +++ b/test/nvme/hotplug.sh @@ -89,8 +89,6 @@ if [ ! -e "$base_img" ]; then exit 0 fi -timing_enter hotplug - timing_enter start_qemu qemu-img create -b "$base_img" -f qcow2 "$test_img" @@ -146,5 +144,3 @@ rm "$test_img" report_test_completion "nvme_hotplug" timing_exit hotplug_test - -timing_exit hotplug diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh index 6503c4520..1b3682dbb 100755 --- a/test/nvme/nvme.sh +++ b/test/nvme/nvme.sh @@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../..) source $rootdir/scripts/common.sh source $rootdir/test/common/autotest_common.sh -timing_enter nvme - if [ $(uname) = Linux ]; then # check that our setup.sh script does not bind NVMe devices to uio/vfio if they # have an active mountpoint @@ -160,5 +158,3 @@ if [ -d /usr/src/fio ]; then done timing_exit fio_plugin fi - -timing_exit nvme diff --git a/test/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh index 57e21ffdc..ab92137fa 100755 --- a/test/nvme/spdk_nvme_cli.sh +++ b/test/nvme/spdk_nvme_cli.sh @@ -17,8 +17,6 @@ if [ ! -d $spdk_nvme_cli ]; then exit 0 fi -timing_enter nvme_cli - if [ $(uname) = Linux ]; then start_stub "-s 2048 -i 0 -m 0xF" trap "kill_stub; exit 1" SIGINT SIGTERM EXIT @@ -52,4 +50,3 @@ if [ $(uname) = Linux ]; then fi report_test_completion spdk_nvme_cli -timing_exit nvme_cli diff --git a/test/nvme/spdk_nvme_cli_cuse.sh b/test/nvme/spdk_nvme_cli_cuse.sh index fa5e0fe8e..c42972254 100755 --- a/test/nvme/spdk_nvme_cli_cuse.sh +++ b/test/nvme/spdk_nvme_cli_cuse.sh @@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../..) source $rootdir/scripts/common.sh source $rootdir/test/common/autotest_common.sh -timing_enter nvme_cli_cuse - NVME_CMD=/usr/local/src/nvme-cli/nvme rpc_py=$rootdir/scripts/rpc.py @@ -74,4 +72,3 @@ trap - SIGINT SIGTERM EXIT killprocess $spdk_tgt_pid report_test_completion spdk_nvme_cli_cuse -timing_exit nvme_cli_cuse diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh index c78bc4491..5d961d706 100755 --- a/test/nvmf/host/aer.sh +++ b/test/nvmf/host/aer.sh @@ -7,7 +7,6 @@ source $rootdir/test/nvmf/common.sh rpc_py="$rootdir/scripts/rpc.py" -timing_enter aer nvmftestinit nvmfappstart "-m 0xF" @@ -49,4 +48,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit aer diff --git a/test/nvmf/host/bdevperf.sh b/test/nvmf/host/bdevperf.sh index e5c7d8191..f35187734 100755 --- a/test/nvmf/host/bdevperf.sh +++ b/test/nvmf/host/bdevperf.sh @@ -23,8 +23,6 @@ function tgt_init() nvmftestinit -timing_enter bdevperf - tgt_init echo "[Nvme]" > $testdir/bdevperf.conf @@ -48,4 +46,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit bdevperf diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh index 22c033e76..3c46992f4 100755 --- a/test/nvmf/host/fio.sh +++ b/test/nvmf/host/fio.sh @@ -15,7 +15,6 @@ if [ ! -d /usr/src/fio ]; then exit 1 fi -timing_enter fio timing_enter start_nvmf_tgt $NVMF_APP -m 0xF & @@ -81,4 +80,3 @@ trap - SIGINT SIGTERM EXIT rm -f ./local-test-0-verify.state nvmftestfini -timing_exit fio diff --git a/test/nvmf/host/identify.sh b/test/nvmf/host/identify.sh index eff7ba272..b12bda5b6 100755 --- a/test/nvmf/host/identify.sh +++ b/test/nvmf/host/identify.sh @@ -12,7 +12,6 @@ rpc_py="$rootdir/scripts/rpc.py" nvmftestinit -timing_enter identify timing_enter start_nvmf_tgt $NVMF_APP -m 0xF & @@ -53,4 +52,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit identify diff --git a/test/nvmf/host/identify_kernel_nvmf.sh b/test/nvmf/host/identify_kernel_nvmf.sh index 57432f522..c0005cdc8 100755 --- a/test/nvmf/host/identify_kernel_nvmf.sh +++ b/test/nvmf/host/identify_kernel_nvmf.sh @@ -7,8 +7,6 @@ source $rootdir/test/nvmf/common.sh nvmftestinit -timing_enter identify_kernel_nvmf_tgt - subsystemname=nqn.2016-06.io.spdk:testnqn modprobe null_blk nr_devices=1 @@ -71,4 +69,3 @@ rmmod null_blk rmmod nvmet nvmftestfini -timing_exit identify_kernel_nvmf_tgt diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh index 2b01819f1..3dbc10e35 100755 --- a/test/nvmf/host/perf.sh +++ b/test/nvmf/host/perf.sh @@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter perf - nvmftestinit nvmfappstart "-m 0xF" @@ -92,4 +90,3 @@ fi trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit perf diff --git a/test/nvmf/host/target_disconnect.sh b/test/nvmf/host/target_disconnect.sh index 178d81b21..592efa0eb 100755 --- a/test/nvmf/host/target_disconnect.sh +++ b/test/nvmf/host/target_disconnect.sh @@ -34,9 +34,6 @@ if [ $TEST_TRANSPORT == "rdma" ] && check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; exit 0 fi -timing_enter target_disconnect - - # Test to make sure we don't segfault or access null pointers when we try to connect to # a discovery controller that doesn't exist yet. set +e @@ -88,4 +85,3 @@ fi trap - SIGINT SIGTERM EXIT rm -f $PLUGIN_DIR/example_config_extended.fio || true nvmftestfini -timing_exit target_disconnect diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index 35e9b20fa..8bb097846 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -9,8 +9,6 @@ fi source $rootdir/test/nvmf/common.sh -timing_enter nvmf_tgt - trap "exit 1" SIGINT SIGTERM EXIT TEST_ARGS=( "$@" ) @@ -59,4 +57,3 @@ trap - SIGINT SIGTERM EXIT revert_soft_roce report_test_completion "nvmf" -timing_exit nvmf_tgt diff --git a/test/nvmf/target/bdev_io_wait.sh b/test/nvmf/target/bdev_io_wait.sh index cf54347db..f6f684e34 100755 --- a/test/nvmf/target/bdev_io_wait.sh +++ b/test/nvmf/target/bdev_io_wait.sh @@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter bdev_io_wait nvmftestinit nvmfappstart "-m 0xF --wait-for-rpc" @@ -47,4 +46,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit bdev_io_wait diff --git a/test/nvmf/target/bdevio.sh b/test/nvmf/target/bdevio.sh index d1ede592c..85e488af5 100755 --- a/test/nvmf/target/bdevio.sh +++ b/test/nvmf/target/bdevio.sh @@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter bdevio nvmftestinit # Don't use cores 0 - 2 to avoid overlap with bdevio. nvmfappstart "-m 0x78" @@ -32,4 +31,3 @@ $rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit bdev_io_wait diff --git a/test/nvmf/target/connect_disconnect.sh b/test/nvmf/target/connect_disconnect.sh index 948fbbf2d..67b67e853 100755 --- a/test/nvmf/target/connect_disconnect.sh +++ b/test/nvmf/target/connect_disconnect.sh @@ -11,8 +11,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" # connect disconnect is geared towards ensuring that we are properly freeing resources after disconnecting qpairs. -timing_enter connect_disconnect - nvmftestinit nvmfappstart "-m 0xF" @@ -43,4 +41,3 @@ set -x trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit connect_disconnect diff --git a/test/nvmf/target/create_transport.sh b/test/nvmf/target/create_transport.sh index 457fecc11..f8709f703 100755 --- a/test/nvmf/target/create_transport.sh +++ b/test/nvmf/target/create_transport.sh @@ -15,7 +15,6 @@ if ! hash nvme; then exit 0 fi -timing_enter cr_trprt nvmftestinit nvmfappstart "-m 0xF" @@ -51,4 +50,3 @@ fi trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit crt_trprt diff --git a/test/nvmf/target/discovery.sh b/test/nvmf/target/discovery.sh index a678a5f97..01fcad08b 100755 --- a/test/nvmf/target/discovery.sh +++ b/test/nvmf/target/discovery.sh @@ -15,7 +15,6 @@ if ! hash nvme; then exit 0 fi -timing_enter discovery nvmftestinit nvmfappstart "-m 0xF" @@ -48,4 +47,3 @@ fi trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit discovery diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh index fc61c95d1..24ddfe4c2 100755 --- a/test/nvmf/target/filesystem.sh +++ b/test/nvmf/target/filesystem.sh @@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter fs_test - nvmftestinit for incapsule in 0 4096; do @@ -72,4 +70,3 @@ for incapsule in 0 4096; do done nvmftestfini -timing_exit fs_test diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh index 73d0cd4ee..901bfb099 100755 --- a/test/nvmf/target/fio.sh +++ b/test/nvmf/target/fio.sh @@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter fio nvmftestinit nvmfappstart "-m 0xF" @@ -78,4 +77,3 @@ rm -f ./local-job2-2-verify.state trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit fio diff --git a/test/nvmf/target/fuzz.sh b/test/nvmf/target/fuzz.sh index 13fcd7c2f..8d7bc9b33 100755 --- a/test/nvmf/target/fuzz.sh +++ b/test/nvmf/target/fuzz.sh @@ -9,8 +9,6 @@ rpc_py="$rootdir/scripts/rpc.py" nvmftestinit -timing_enter fuzz_test - $NVMF_APP -m 0xF >$output_dir/nvmf_fuzz_tgt_output.txt 2>&1 & nvmfpid=$! @@ -42,4 +40,3 @@ nvmfcleanup killprocess $nvmfpid nvmftestfini -timing_exit fuzz_test diff --git a/test/nvmf/target/initiator_timeout.sh b/test/nvmf/target/initiator_timeout.sh index f86d221ac..d302e6350 100755 --- a/test/nvmf/target/initiator_timeout.sh +++ b/test/nvmf/target/initiator_timeout.sh @@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter initiator_timeout nvmftestinit nvmfappstart "-m 0xF" @@ -70,4 +69,3 @@ rm -f ./local-job0-0-verify.state trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit initiator_timeout diff --git a/test/nvmf/target/multiconnection.sh b/test/nvmf/target/multiconnection.sh index ba6b362ae..275e3f35b 100755 --- a/test/nvmf/target/multiconnection.sh +++ b/test/nvmf/target/multiconnection.sh @@ -12,7 +12,6 @@ NVMF_SUBSYS=11 rpc_py="$rootdir/scripts/rpc.py" -timing_enter multiconnection nvmftestinit nvmfappstart "-m 0xF" @@ -55,4 +54,3 @@ rm -f ./local-job0-0-verify.state trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit multiconnection diff --git a/test/nvmf/target/multitarget.sh b/test/nvmf/target/multitarget.sh index a07429880..ac786ec79 100755 --- a/test/nvmf/target/multitarget.sh +++ b/test/nvmf/target/multitarget.sh @@ -8,7 +8,6 @@ source $rootdir/test/nvmf/common.sh # multitarget RPCs as the in-tree applications don't support multi-target functionality. rpc_py="$rootdir/test/nvmf/target/multitarget_rpc.py" -timing_enter multitarget nvmftestinit nvmfappstart "-m 0xF" @@ -36,4 +35,3 @@ fi trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit multitarget diff --git a/test/nvmf/target/nmic.sh b/test/nvmf/target/nmic.sh index 696766697..6ecb13dc5 100755 --- a/test/nvmf/target/nmic.sh +++ b/test/nvmf/target/nmic.sh @@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter nmic nvmftestinit nvmfappstart "-m 0xF" @@ -55,4 +54,3 @@ nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit nmic diff --git a/test/nvmf/target/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh index 0c508bfc6..5caf11790 100755 --- a/test/nvmf/target/nvme_cli.sh +++ b/test/nvmf/target/nvme_cli.sh @@ -17,7 +17,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter nvme_cli nvmftestinit nvmfappstart "-m 0xF" @@ -75,4 +74,3 @@ trap - SIGINT SIGTERM EXIT nvmftestfini report_test_completion "nvmf_spdk_nvme_cli" -timing_exit nvme_cli diff --git a/test/nvmf/target/nvmf_lvol.sh b/test/nvmf/target/nvmf_lvol.sh index acde0e583..2229e6663 100755 --- a/test/nvmf/target/nvmf_lvol.sh +++ b/test/nvmf/target/nvmf_lvol.sh @@ -12,7 +12,6 @@ LVOL_BDEV_FINAL_SIZE=30 rpc_py="$rootdir/scripts/rpc.py" -timing_enter lvol_integrity nvmftestinit nvmfappstart "-m 0x7" @@ -67,4 +66,3 @@ rm -f ./local-job* trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit lvol_integrity diff --git a/test/nvmf/target/nvmf_vhost.sh b/test/nvmf/target/nvmf_vhost.sh index 32d51ab87..700bb69ae 100755 --- a/test/nvmf/target/nvmf_vhost.sh +++ b/test/nvmf/target/nvmf_vhost.sh @@ -21,7 +21,6 @@ VHOST_SOCK="/tmp/vhost_rpc.sock" VHOST_APP="$rootdir/app/vhost/vhost -p 0 -r $VHOST_SOCK -u" VHOST_RPC="$rootdir/scripts/rpc.py -s $VHOST_SOCK" -timing_enter nvmf_vhost nvmftestinit # Start Apps @@ -68,4 +67,3 @@ trap - SIGINT SIGTERM EXIT killprocess $vhostpid nvmftestfini -timing_exit nvmf_vhost diff --git a/test/nvmf/target/rpc.sh b/test/nvmf/target/rpc.sh index 9fe6c2c26..1b4badf2c 100755 --- a/test/nvmf/target/rpc.sh +++ b/test/nvmf/target/rpc.sh @@ -19,7 +19,6 @@ function jsum() jq "$filter" | awk '{s+=$1}END{print s}' } -timing_enter rpc nvmftestinit nvmfappstart "-m 0xF" @@ -127,4 +126,3 @@ fi trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit rpc diff --git a/test/nvmf/target/shutdown.sh b/test/nvmf/target/shutdown.sh index e99101b6e..bd8efd4ac 100755 --- a/test/nvmf/target/shutdown.sh +++ b/test/nvmf/target/shutdown.sh @@ -34,7 +34,6 @@ function waitforio() { return $ret } -timing_enter shutdown nvmftestinit nvmfappstart "-m 0x1E" @@ -140,4 +139,3 @@ trap - SIGINT SIGTERM EXIT timing_enter testfini nvmftestfini timing_exit testfini -timing_exit shutdown diff --git a/test/nvmf/target/srq_overwhelm.sh b/test/nvmf/target/srq_overwhelm.sh index ad05a237e..a7fc2bed9 100755 --- a/test/nvmf/target/srq_overwhelm.sh +++ b/test/nvmf/target/srq_overwhelm.sh @@ -10,7 +10,6 @@ MALLOC_BLOCK_SIZE=512 rpc_py="$rootdir/scripts/rpc.py" -timing_enter srq_overwhelm nvmftestinit if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then @@ -49,4 +48,3 @@ done trap - SIGINT SIGTERM EXIT nvmftestfini -timing_exit srq_overwhelm diff --git a/test/ocf/ocf.sh b/test/ocf/ocf.sh index 52a36ed27..f67bba57f 100755 --- a/test/ocf/ocf.sh +++ b/test/ocf/ocf.sh @@ -7,13 +7,9 @@ source $rootdir/test/common/autotest_common.sh function suite() { - timing_enter $(basename "$@") run_test suite "ocf_$(basename "$@")" "$@" - timing_exit $(basename "$@") } -timing_enter ocf - suite "$testdir/integrity/fio-modes.sh" suite "$testdir/integrity/bdevperf-iotypes.sh" suite "$testdir/integrity/stats.sh" @@ -22,5 +18,4 @@ suite "$testdir/management/multicore.sh" suite "$testdir/management/persistent-metadata.sh" suite "$testdir/management/remove.sh" -timing_exit ocf report_test_completion "ocf" diff --git a/test/pmem/pmem.sh b/test/pmem/pmem.sh index 5350c0bd3..fa40d0908 100755 --- a/test/pmem/pmem.sh +++ b/test/pmem/pmem.sh @@ -645,7 +645,6 @@ function delete_bdev_tc2() return 0 } -timing_enter pmem vhost_start if ! $enable_script_debug; then set +x @@ -694,4 +693,3 @@ fi pmem_clean_pool_file report_test_completion "pmem" vhost_kill 0 -timing_exit pmem diff --git a/test/rpc_client/rpc_client.sh b/test/rpc_client/rpc_client.sh index e7da9146b..2d20f5b7c 100755 --- a/test/rpc_client/rpc_client.sh +++ b/test/rpc_client/rpc_client.sh @@ -4,8 +4,6 @@ testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh -timing_enter rpc_client $rootdir/test/rpc_client/rpc_client_test -timing_exit rpc_client trap - SIGINT SIGTERM EXIT diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh index 4f5a444e5..ecce5b2cf 100755 --- a/test/spdkcli/iscsi.sh +++ b/test/spdkcli/iscsi.sh @@ -9,7 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh MATCH_FILE="spdkcli_iscsi.test" SPDKCLI_BRANCH="/iscsi" -timing_enter spdkcli_iscsi trap 'on_error_exit;' ERR timing_enter run_iscsi_tgt @@ -71,5 +70,4 @@ $spdkcli_job "'/iscsi/auth_groups delete_secret 1 test2' 'user=test2' timing_exit spdkcli_clear_iscsi_config killprocess $iscsi_tgt_pid -timing_exit spdkcli_iscsi report_test_completion spdk_cli diff --git a/test/spdkcli/nvmf.sh b/test/spdkcli/nvmf.sh index 029221395..b198d2df7 100755 --- a/test/spdkcli/nvmf.sh +++ b/test/spdkcli/nvmf.sh @@ -9,7 +9,6 @@ source $rootdir/test/nvmf/common.sh MATCH_FILE="spdkcli_nvmf.test" SPDKCLI_BRANCH="/nvmf" -timing_enter spdkcli_nvmf trap 'on_error_exit; revert_soft_roce' ERR rdma_device_init @@ -84,5 +83,4 @@ timing_exit spdkcli_clear_nvmf_config killprocess $nvmf_tgt_pid #revert_soft_roce -timing_exit spdkcli_nvmf report_test_completion spdk_cli_nvmf diff --git a/test/spdkcli/pmem.sh b/test/spdkcli/pmem.sh index 7fac62ae9..64dbdaf1f 100755 --- a/test/spdkcli/pmem.sh +++ b/test/spdkcli/pmem.sh @@ -8,7 +8,6 @@ source $rootdir/test/spdkcli/common.sh MATCH_FILE="spdkcli_pmem.test" SPDKCLI_BRANCH="/bdevs/pmemblk" -timing_enter spdkcli_pmem trap 'rm -f $testdir/match_files/spdkcli_pmem_info.test; on_error_exit;' ERR timing_enter run_spdk_tgt @@ -46,5 +45,4 @@ rm -f $testdir/match_files/spdkcli_pmem_info.test timing_exit spdkcli_clear_pmem_config killprocess $spdk_tgt_pid -timing_exit spdkcli_pmem report_test_completion spdk_cli diff --git a/test/spdkcli/raid.sh b/test/spdkcli/raid.sh index 24f733599..eecf47d1b 100755 --- a/test/spdkcli/raid.sh +++ b/test/spdkcli/raid.sh @@ -11,7 +11,6 @@ SPDKCLI_BRANCH="/bdevs" testdir=$(readlink -f $(dirname $0)) . $testdir/common.sh -timing_enter spdkcli_raid trap 'on_error_exit;' ERR timing_enter run_spdk_tgt @@ -45,5 +44,4 @@ $spdkcli_job "'/bdevs/malloc delete Malloc1' '' True timing_exit spdkcli_delete_malloc killprocess $spdk_tgt_pid -timing_exit spdkcli_raid report_test_completion spdk_cli diff --git a/test/spdkcli/rbd.sh b/test/spdkcli/rbd.sh index 75cef90c7..f26299e92 100755 --- a/test/spdkcli/rbd.sh +++ b/test/spdkcli/rbd.sh @@ -8,7 +8,6 @@ source $rootdir/test/spdkcli/common.sh MATCH_FILE="spdkcli_rbd.test" SPDKCLI_BRANCH="/bdevs/rbd" -timing_enter spdk_cli_rbd trap 'on_error_exit' ERR timing_enter run_spdk_tgt run_spdk_tgt @@ -32,5 +31,4 @@ timing_exit spdkcli_clear_rbd_config killprocess $spdk_tgt_pid -timing_exit spdk_cli_rbd report_test_completion spdk_cli_rbd diff --git a/test/spdkcli/tcp.sh b/test/spdkcli/tcp.sh index 4665ccaf3..4162e2b78 100755 --- a/test/spdkcli/tcp.sh +++ b/test/spdkcli/tcp.sh @@ -46,7 +46,6 @@ function waitfortcplisten() { IP_ADDRESS="127.0.0.1" PORT="9998" -timing_enter spdkcli_tcp trap 'on_error_exit;' ERR timing_enter run_spdk_tgt_tcp @@ -60,6 +59,4 @@ timing_exit run_spdk_tgt_tcp killprocess $spdk_tgt_pid -timing_exit spdkcli_tcp - report_test_completion spdkcli_tcp diff --git a/test/spdkcli/vhost.sh b/test/spdkcli/vhost.sh index 512bff691..544158f22 100755 --- a/test/spdkcli/vhost.sh +++ b/test/spdkcli/vhost.sh @@ -8,7 +8,6 @@ source $rootdir/test/spdkcli/common.sh MATCH_FILE="spdkcli_vhost.test" SPDKCLI_BRANCH="/" -timing_enter spdk_cli_vhost trap 'on_error_exit' ERR timing_enter run_vhost_tgt run_vhost_tgt @@ -144,5 +143,4 @@ timing_exit spdkcli_load_config killprocess $vhost_tgt_pid -timing_exit spdk_cli_vhost report_test_completion spdk_cli_vhost diff --git a/test/spdkcli/virtio.sh b/test/spdkcli/virtio.sh index 118ba8b3d..f46b1624c 100755 --- a/test/spdkcli/virtio.sh +++ b/test/spdkcli/virtio.sh @@ -6,7 +6,6 @@ source $rootdir/test/common/autotest_common.sh source $rootdir/test/spdkcli/common.sh trap 'killprocess $virtio_pid; on_error_exit' ERR -timing_enter spdk_cli_vhost_init timing_enter run_spdk_tgt run_spdk_tgt @@ -77,5 +76,3 @@ timing_exit spdkcli_clear_virtio_config killprocess $virtio_pid killprocess $spdk_tgt_pid - -timing_exit spdk_cli_vhost_init diff --git a/test/vhost/fuzz/fuzz.sh b/test/vhost/fuzz/fuzz.sh index 4684f94d9..865a9dcf7 100755 --- a/test/vhost/fuzz/fuzz.sh +++ b/test/vhost/fuzz/fuzz.sh @@ -13,8 +13,6 @@ vhost_rpc_py="$rootdir/scripts/rpc.py" fuzz_generic_rpc_py="$rootdir/scripts/rpc.py -s $FUZZ_RPC_SOCK" fuzz_specific_rpc_py="$rootdir/test/app/fuzz/common/fuzz_rpc.py -s $FUZZ_RPC_SOCK" -timing_enter fuzz_test - $VHOST_APP >$output_dir/vhost_fuzz_tgt_output.txt 2>&1 & vhostpid=$! waitforlisten $vhostpid @@ -66,5 +64,3 @@ wait $fuzzpid trap - SIGINT SIGTERM exit killprocess $vhostpid - -timing_exit fuzz_test diff --git a/test/vhost/vhost.sh b/test/vhost/vhost.sh index 07c78c0ce..d75a24db0 100755 --- a/test/vhost/vhost.sh +++ b/test/vhost/vhost.sh @@ -29,49 +29,35 @@ DISKS_NUMBER=$(lspci -mm -n | grep 0108 | tr -d '"' | awk -F " " '{print "0000:" WORKDIR=$(readlink -f $(dirname $0)) -timing_enter vhost -timing_enter negative run_test case "vhost_negative" $WORKDIR/other/negative.sh report_test_completion "vhost_negative" -timing_exit negative -timing_enter vhost_boot run_test suite "vhost_boot" $WORKDIR/vhost_boot/vhost_boot.sh --vm_image=$VM_IMAGE report_test_completion "vhost_boot" -timing_exit vhost_boot if [ $RUN_NIGHTLY -eq 1 ]; then - timing_enter integrity_blk echo 'Running blk integrity suite...' run_test case "vhost_blk_integrity" $WORKDIR/fiotest/fio.sh -x --fio-bin=$FIO_BIN \ --vm=0,$VM_IMAGE,Nvme0n1p0:RaidBdev0:RaidBdev1:RaidBdev2 \ --test-type=spdk_vhost_blk \ --fio-job=$WORKDIR/common/fio_jobs/default_integrity.job report_test_completion "nightly_vhost_integrity_blk" - timing_exit integrity_blk - timing_enter integrity echo 'Running SCSI integrity suite...' run_test case "vhost_scsi_integrity" $WORKDIR/fiotest/fio.sh -x --fio-bin=$FIO_BIN \ --vm=0,$VM_IMAGE,Nvme0n1p0:RaidBdev0:RaidBdev1:RaidBdev2 \ --test-type=spdk_vhost_scsi \ --fio-job=$WORKDIR/common/fio_jobs/default_integrity.job report_test_completion "nightly_vhost_integrity" - timing_exit integrity - timing_enter fs_integrity_scsi echo 'Running filesystem integrity suite with SCSI...' run_test case "vhost_scsi_fs_integrity" $WORKDIR/integrity/integrity_start.sh --ctrl-type=spdk_vhost_scsi --fs="xfs ntfs btrfs ext4" report_test_completion "vhost_fs_integrity_scsi" - timing_exit fs_integrity_scsi - timing_enter fs_integrity_blk echo 'Running filesystem integrity suite with BLK...' run_test case "vhost_blk_fs_integrity" $WORKDIR/integrity/integrity_start.sh --ctrl-type=spdk_vhost_blk --fs="xfs ntfs btrfs ext4" report_test_completion "vhost_fs_integrity_blk" - timing_exit fs_integrity_blk - timing_enter integrity_lvol_scsi_nightly if [[ $DISKS_NUMBER -ge 2 ]]; then echo 'Running lvol integrity nightly suite with two cores and two controllers' run_test case "vhost_scsi_2core_2ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \ @@ -89,9 +75,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then echo 'Running lvol integrity nightly suite with one core and one controller' run_test case "vhost_scsi_1core_1ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \ --ctrl-type=spdk_vhost_scsi --max-disks=1 - timing_exit integrity_lvol_scsi_nightly - timing_enter integrity_lvol_blk_nightly if [[ $DISKS_NUMBER -ge 2 ]]; then echo 'Running lvol integrity nightly suite with two cores and two controllers' run_test case "vhost_blk_2core_2ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \ @@ -109,37 +93,24 @@ if [ $RUN_NIGHTLY -eq 1 ]; then echo 'Running lvol integrity nightly suite with one core and one controller' run_test case "vhost_lvol_integrity_1core_1ctrl" $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \ --ctrl-type=spdk_vhost_blk --max-disks=1 - timing_exit integrity_lvol_blk_nightly - timing_enter readonly echo 'Running readonly tests suite...' run_test case "vhost_readonly" $WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1 -x report_test_completion "vhost_readonly" - timing_exit readonly - timing_enter vhost_migration echo 'Running migration suite...' run_test case "vhost_migration" $WORKDIR/migration/migration.sh -x \ --fio-bin=$FIO_BIN --os=$VM_IMAGE --test-cases=1,2 - timing_exit vhost_migration fi -timing_enter integrity_lvol_scsi echo 'Running lvol integrity suite...' run_test case "vhost_scsi_lvol_integrity" $WORKDIR/lvol/lvol_test.sh -x --fio-bin=$FIO_BIN \ --ctrl-type=spdk_vhost_scsi --thin-provisioning report_test_completion "vhost_integrity_lvol_scsi" -timing_exit integrity_lvol_scsi -timing_enter integrity_lvol_blk echo 'Running lvol integrity suite...' run_test case "vhost_blk_lvol_integrity" $WORKDIR/lvol/lvol_test.sh -x --fio-bin=$FIO_BIN \ --ctrl-type=spdk_vhost_blk report_test_completion "vhost_integrity_lvol_blk" -timing_exit integrity_lvol_blk -timing_enter spdk_cli run_test suite "spdkcli_vhost" ./test/spdkcli/vhost.sh -timing_exit spdk_cli - -timing_exit vhost diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index f1cbe4ac5..d2c97c89b 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -58,7 +58,6 @@ fi vhosttestinit -timing_enter vhost_boot trap 'err_clean "${FUNCNAME}" "${LINENO}"' ERR timing_enter start_vhost vhost_run 0 @@ -122,6 +121,4 @@ $rpc_py bdev_lvol_delete_lvstore -u $lvs_u vhost_kill 0 timing_exit clean_vhost -timing_exit vhost_boot - vhosttestfini diff --git a/test/vmd/vmd.sh b/test/vmd/vmd.sh index 888e51b7e..5a3e1068f 100755 --- a/test/vmd/vmd.sh +++ b/test/vmd/vmd.sh @@ -14,8 +14,6 @@ if [ -z "$pci_devs" ]; then exit 1 fi -timing_enter vmd - timing_enter identify for bdf in $pci_devs; do $rootdir/examples/nvme/identify/identify -i 0 -V -r "trtype:PCIe traddr:$bdf" @@ -56,5 +54,3 @@ done trap - SIGINT SIGTERM EXIT killprocess $svcpid - -timing_exit vmd