From 039360d3029fe79314f6872ae617461a7d91864a Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 6 Feb 2020 23:40:15 -0500 Subject: [PATCH] bdevperf: Call bdevperf_test() at the end of bdevperf_construct_targets() Move bdevperf_test() into bdevperf_construct_targets() from _bdevperf_init_thread_done() and rpc_perform_tests(). Following the last patch, this consolidation will make the code a little cleaner. Signed-off-by: Shuhei Matsumoto Change-Id: Ided4653941f45ff6ac8edbea504560cc8a9fb5a0 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/637 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- test/bdev/bdevperf/bdevperf.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index ef0c0b078..47d4cf8d1 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -1100,13 +1100,13 @@ bdevperf_construct_targets(void) bdev = spdk_bdev_get_by_name(g_target_bdev_name); if (!bdev) { fprintf(stderr, "Unable to find bdev '%s'\n", g_target_bdev_name); - return; + goto end; } for (core_idx = 0; core_idx < core_count_for_each_bdev; core_idx++) { rc = bdevperf_construct_target(bdev); if (rc != 0) { - return; + goto end; } } } else { @@ -1115,13 +1115,16 @@ bdevperf_construct_targets(void) for (core_idx = 0; core_idx < core_count_for_each_bdev; core_idx++) { rc = bdevperf_construct_target(bdev); if (rc != 0) { - return; + goto end; } } bdev = spdk_bdev_next_leaf(bdev); } } + +end: + bdevperf_test(); } static int @@ -1151,8 +1154,6 @@ _bdevperf_init_thread_done(void *ctx) } bdevperf_construct_targets(); - - bdevperf_test(); } static void @@ -1215,8 +1216,6 @@ rpc_perform_tests(struct spdk_jsonrpc_request *request, const struct spdk_json_v g_request = request; bdevperf_construct_targets(); - - bdevperf_test(); } SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME)