From ded0c2d1466eb2a63f1a0961a1644f0ac99d9dfd Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 20 Mar 2020 14:03:08 -0700 Subject: [PATCH] bdevperf: Break code for running a job into a separate function This will make some refactoring later a bit clearer. Signed-off-by: Ben Walker Change-Id: Iae2c36d1c298377cd20cf3226b3b8dfe712484ff Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1503 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Paul Luse Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- test/bdev/bdevperf/bdevperf.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index 15271b387..6d75abc34 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -826,6 +826,22 @@ reset_job(void *arg) return -1; } +static void +bdevperf_job_run(struct bdevperf_job *job) +{ + /* Submit initial I/O for this job. Each time one + * completes, another will be submitted. */ + + /* Start a timer to stop this I/O chain when the run is over */ + job->run_timer = spdk_poller_register(bdevperf_job_drain, job, g_time_in_usec); + if (g_reset) { + job->reset_timer = spdk_poller_register(reset_job, job, + 10 * 1000000); + } + + bdevperf_submit_io(job, g_queue_depth); +} + static void bdevperf_submit_on_reactor(struct spdk_io_channel_iter *i) { @@ -849,14 +865,7 @@ bdevperf_submit_on_reactor(struct spdk_io_channel_iter *i) continue; } - /* Start a timer to stop this I/O chain when the run is over */ - job->run_timer = spdk_poller_register(bdevperf_job_drain, job, - g_time_in_usec); - if (g_reset) { - job->reset_timer = spdk_poller_register(reset_job, job, - 10 * 1000000); - } - bdevperf_submit_io(job, g_queue_depth); + bdevperf_job_run(job); } spdk_for_each_channel_continue(i, 0);