From 4579fc9d2c16c2a8bf2a4b385ad0e085ab4c9033 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Sun, 9 Feb 2020 17:18:10 -0500 Subject: [PATCH] bdevperf: bdevperf_construct_targets_tasks() calls bdevperf_test() at its end by swapping Creating targets, creating tasks, and then running I/O is the actual ordering of start-up. So adjust ordering of function calls to make easier us to follow. Change the return type of bdevperf_construct_targets_tasks() from int to void, and call bdevperf_test() at the end of bdevperf_construct_targets_tasks(). Then replace bdevperf_test() by bdevperf_construct_targets_tasks(). Signed-off-by: Shuhei Matsumoto Change-Id: Id1396ff4ba199778300f5ddaf79db5f8f2e0ccb6 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/642 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- test/bdev/bdevperf/bdevperf.c | 74 +++++++++++++++-------------------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index 47d4cf8d1..4c91a3264 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -880,6 +880,23 @@ performance_statistics_thread(void *arg) return -1; } +static void +bdevperf_test(void) +{ + printf("Running I/O for %" PRIu64 " seconds...\n", g_time_in_usec / 1000000); + fflush(stdout); + + /* Start a timer to dump performance numbers */ + g_shutdown_tsc = spdk_get_ticks(); + if (g_show_performance_real_time) { + g_perf_timer = spdk_poller_register(performance_statistics_thread, NULL, + g_show_performance_period_in_usec); + } + + /* Iterate target groups to start all I/O */ + spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_group, NULL, NULL); +} + static struct bdevperf_task *bdevperf_construct_task_on_target(struct io_target *target) { struct bdevperf_task *task; @@ -915,7 +932,7 @@ static struct bdevperf_task *bdevperf_construct_task_on_target(struct io_target return task; } -static int +static void bdevperf_construct_targets_tasks(void) { struct io_target_group *group; @@ -923,6 +940,13 @@ bdevperf_construct_targets_tasks(void) struct bdevperf_task *task; int i, task_num = g_queue_depth; + if (g_target_count == 0) { + fprintf(stderr, "No valid bdevs found.\n"); + g_run_rc = -ENODEV; + bdevperf_test_done(); + return; + } + if (g_reset) { task_num += 1; } @@ -933,52 +957,18 @@ bdevperf_construct_targets_tasks(void) for (i = 0; i < task_num; i++) { task = bdevperf_construct_task_on_target(target); if (task == NULL) { - goto ret; + fprintf(stderr, "Bdevperf program exits due to memory allocation issue\n"); + fprintf(stderr, "Use -d XXX to allocate more huge pages, e.g., -d 4096\n"); + g_run_rc = -1; + bdevperf_test_done(); + return; } TAILQ_INSERT_TAIL(&target->task_list, task, link); } } } - return 0; - -ret: - fprintf(stderr, "Bdevperf program exits due to memory allocation issue\n"); - fprintf(stderr, "Use -d XXX to allocate more huge pages, e.g., -d 4096\n"); - return -1; -} - -static void -bdevperf_test(void) -{ - int rc; - - if (g_target_count == 0) { - fprintf(stderr, "No valid bdevs found.\n"); - g_run_rc = -ENODEV; - bdevperf_test_done(); - return; - } - - rc = bdevperf_construct_targets_tasks(); - if (rc) { - g_run_rc = rc; - bdevperf_test_done(); - return; - } - - printf("Running I/O for %" PRIu64 " seconds...\n", g_time_in_usec / 1000000); - fflush(stdout); - - /* Start a timer to dump performance numbers */ - g_shutdown_tsc = spdk_get_ticks(); - if (g_show_performance_real_time) { - g_perf_timer = spdk_poller_register(performance_statistics_thread, NULL, - g_show_performance_period_in_usec); - } - - /* Iterate target groups to start all I/O */ - spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_group, NULL, NULL); + bdevperf_test(); } static void @@ -1124,7 +1114,7 @@ bdevperf_construct_targets(void) } end: - bdevperf_test(); + bdevperf_construct_targets_tasks(); } static int