ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdevperf: Move g_job_count in struct bdevperf

Browse Source 
Group the global parameters into the global structure

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: I552b536869221efb58bc30820b7adfc01c74c293
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1388
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Ben Walker 2020-03-19 16:05:17 -07:00 committed by Tomasz Zawadzki
parent 992fd76dc7
commit de747f08d6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/bdev/bdevperf/bdevperf.c
View File

@ -127,15 +127,16 @@ struct bdevperf_reactor {
struct spdk_bdevperf { struct spdk_bdevperf {
TAILQ_HEAD(, bdevperf_reactor) reactors; TAILQ_HEAD(, bdevperf_reactor) reactors;
uint32_t num_reactors; uint32_t num_reactors;
uint32_t running_jobs;
}; };
static struct spdk_bdevperf g_bdevperf = { static struct spdk_bdevperf g_bdevperf = {
.reactors = TAILQ_HEAD_INITIALIZER(g_bdevperf.reactors), .reactors = TAILQ_HEAD_INITIALIZER(g_bdevperf.reactors),
.num_reactors = 0, .num_reactors = 0,
.running_jobs = 0,
}; };
struct bdevperf_reactor *g_next_reactor; struct bdevperf_reactor *g_next_reactor;
static uint32_t g_job_count = 0;
static void static void
generate_data(void *buf, int buf_len, int block_size, void *md_buf, int md_size, generate_data(void *buf, int buf_len, int block_size, void *md_buf, int md_size,
@ -317,7 +318,7 @@ bdevperf_test_done(void *ctx)
static void static void
end_run(void *ctx) end_run(void *ctx)
{ {
if (--g_job_count == 0) { if (--g_bdevperf.running_jobs == 0) {
if (g_show_performance_real_time) { if (g_show_performance_real_time) {
spdk_poller_unregister(&g_perf_timer); spdk_poller_unregister(&g_perf_timer);
} }
@ -817,7 +818,7 @@ bdevperf_submit_on_reactor(struct spdk_io_channel_iter *i)
if (!job->ch) { if (!job->ch) {
printf("Skip this device (%s) as IO channel not setup.\n", printf("Skip this device (%s) as IO channel not setup.\n",
spdk_bdev_get_name(job->bdev)); spdk_bdev_get_name(job->bdev));
g_job_count--; g_bdevperf.running_jobs--;
g_run_rc = -1; g_run_rc = -1;
spdk_bdev_close(job->bdev_desc); spdk_bdev_close(job->bdev_desc);
continue; continue;
@ -1062,7 +1063,7 @@ end:
static void static void
bdevperf_construct_jobs_tasks(void) bdevperf_construct_jobs_tasks(void)
{ {
if (g_job_count == 0) { if (g_bdevperf.running_jobs == 0) {
fprintf(stderr, "No valid bdevs found.\n"); fprintf(stderr, "No valid bdevs found.\n");
g_run_rc = -ENODEV; g_run_rc = -ENODEV;
bdevperf_test_done(NULL); bdevperf_test_done(NULL);
@ -1164,8 +1165,8 @@ _bdevperf_construct_jobs_done(struct spdk_io_channel_iter *i, int status)
ctx = spdk_io_channel_iter_get_ctx(i); ctx = spdk_io_channel_iter_get_ctx(i);
/* Update g_job_count on the master thread. */ /* Update g_bdevperf.running_jobs on the master thread. */
g_job_count += ctx->job_count; g_bdevperf.running_jobs += ctx->job_count;
free(ctx); free(ctx);
@ -1435,7 +1436,7 @@ spdk_bdevperf_shutdown_cb(void)
return; return;
} }
if (g_job_count == 0) { if (g_bdevperf.running_jobs == 0) {
bdevperf_test_done(NULL); bdevperf_test_done(NULL);
return; return;
} }