From df8992dfb1edc61a601da989f62c929e4d856f56 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 23 Dec 2019 17:18:26 -0500 Subject: [PATCH] bdevperf: Change break to continue in some for loops Number of entries of the array g_head is spdk_env_get_core_count(), and hence we did not need to break from some for loops. For them, continue to the next iteration will be more appropriate and do the changes in this patch. Signed-off-by: Shuhei Matsumoto Change-Id: I6e97099622d58f44d92482beaf24ca61de4ca038 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478756 Tested-by: SPDK CI Jenkins Community-CI: SPDK CI Jenkins Reviewed-by: Seth Howell Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki --- test/bdev/bdevperf/bdevperf.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index eb52f874f..e93b6b413 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -1093,9 +1093,6 @@ bdevperf_construct_targets_tasks(void) /* Initialize task list for each target */ for (i = 0; i < spdk_env_get_core_count(); i++) { target = g_head[i]; - if (!target) { - break; - } while (target != NULL) { for (j = 0; j < task_num; j++) { task = bdevperf_construct_task_on_target(target); @@ -1285,12 +1282,11 @@ bdevperf_test(void) /* Send events to start all I/O */ for (i = 0; i < core_count; i++) { target = g_head[i]; - if (target == NULL) { - return -1; + if (target != NULL) { + event = spdk_event_allocate(target->lcore, bdevperf_submit_on_core, + target, NULL); + spdk_event_call(event); } - event = spdk_event_allocate(target->lcore, bdevperf_submit_on_core, - target, NULL); - spdk_event_call(event); } return 0; } @@ -1354,20 +1350,21 @@ spdk_bdevperf_shutdown_cb(void) return; } + if (g_head == NULL) { + spdk_app_stop(0); + return; + } + g_shutdown_tsc = spdk_get_ticks() - g_shutdown_tsc; /* Send events to stop all I/O on each core */ for (i = 0; i < spdk_env_get_core_count(); i++) { - if (g_head == NULL) { - break; - } target = g_head[i]; - if (target == NULL) { - break; + if (target != NULL) { + event = spdk_event_allocate(target->lcore, bdevperf_stop_io_on_core, + target, NULL); + spdk_event_call(event); } - event = spdk_event_allocate(target->lcore, bdevperf_stop_io_on_core, - target, NULL); - spdk_event_call(event); } }