From e4e4a9654371aaad44de3de5e491cdb8fa4f2f10 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Sun, 22 Dec 2019 18:10:10 -0500 Subject: [PATCH] bdevperf: Always pass the submitting task to bdevperf_submit_single() Extract bdevperf_target_get_task() from bdevperf_submit_single(). Then inline the contents of bdevperf_prep_task() into bdevperf_submit_single() and remove bdevperf_prep_task(). These two patches simplify a little weird nesting and parameter passing of bdevperf_submit_single(). Signed-off-by: Shuhei Matsumoto Change-Id: I37f4ca732d6d9479553365cd612b90dec51e2228 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478690 Tested-by: SPDK CI Jenkins Reviewed-by: Alexey Marchuk Reviewed-by: Tomasz Zawadzki Reviewed-by: Seth Howell Reviewed-by: Changpeng Liu Community-CI: SPDK CI Jenkins --- test/bdev/bdevperf/bdevperf.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index 403ed3fdb..bb2488b9a 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -792,9 +792,8 @@ bdevperf_target_get_task(struct io_target *target) static __thread unsigned int seed = 0; static void -bdevperf_prep_task(struct bdevperf_task *task) +bdevperf_submit_single(struct io_target *target, struct bdevperf_task *task) { - struct io_target *target = task->target; uint64_t offset_in_ios; if (g_is_random) { @@ -843,21 +842,14 @@ bdevperf_prep_task(struct bdevperf_task *task) bdevperf_submit_task(task); } -static void -bdevperf_submit_single(struct io_target *target, struct bdevperf_task *task) -{ - if (!task) { - task = bdevperf_target_get_task(target); - } - - bdevperf_prep_task(task); -} - static void bdevperf_submit_io(struct io_target *target, int queue_depth) { + struct bdevperf_task *task; + while (queue_depth-- > 0) { - bdevperf_submit_single(target, NULL); + task = bdevperf_target_get_task(target); + bdevperf_submit_single(target, task); } }