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

bdevperf: Change return type of bdevperf_test() to void and include its error handling

Browse Source 
Subsequent patches will call bdevperf_test() as callback to
bdevperf_construct_targets(). Changing return type of bdevperf_test()
to void and including its error handling will make the code cleaner.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I30fe38cfb73fbc593d079d5b66a540c0ce96fe19
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/636
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-02-06 23:37:11 -05:00 committed by Tomasz Zawadzki
parent 3673217aa3
commit 5780ad9638
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -948,19 +948,23 @@ ret:
return -1; return -1;
} }
static int static void
bdevperf_test(void) bdevperf_test(void)
{ {
int rc; int rc;
if (g_target_count == 0) { if (g_target_count == 0) {
fprintf(stderr, "No valid bdevs found.\n"); fprintf(stderr, "No valid bdevs found.\n");
return -ENODEV; g_run_rc = -ENODEV;
bdevperf_test_done();
return;
} }
rc = bdevperf_construct_targets_tasks(); rc = bdevperf_construct_targets_tasks();
if (rc) { if (rc) {
return rc; g_run_rc = rc;
bdevperf_test_done();
return;
} }
printf("Running I/O for %" PRIu64 " seconds...\n", g_time_in_usec / 1000000); printf("Running I/O for %" PRIu64 " seconds...\n", g_time_in_usec / 1000000);
@ -975,8 +979,6 @@ bdevperf_test(void)
/* Iterate target groups to start all I/O */ /* Iterate target groups to start all I/O */
spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_group, NULL, NULL); spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_group, NULL, NULL);
return 0;
} }
static void static void
@ -1141,8 +1143,6 @@ io_target_group_destroy(void *io_device, void *ctx_buf)
static void static void
_bdevperf_init_thread_done(void *ctx) _bdevperf_init_thread_done(void *ctx)
{ {
int rc;
g_master_thread = spdk_get_thread(); g_master_thread = spdk_get_thread();
if (g_wait_for_tests) { if (g_wait_for_tests) {
@ -1152,12 +1152,7 @@ _bdevperf_init_thread_done(void *ctx)
bdevperf_construct_targets(); bdevperf_construct_targets();
rc = bdevperf_test(); bdevperf_test();
if (rc) {
g_run_rc = rc;
bdevperf_test_done();
return;
}
} }
static void static void
@ -1206,8 +1201,6 @@ rpc_perform_tests_cb(void)
static void static void
rpc_perform_tests(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) rpc_perform_tests(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params)
{ {
int rc;
if (params != NULL) { if (params != NULL) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"perform_tests method requires no parameters"); "perform_tests method requires no parameters");
@ -1223,11 +1216,7 @@ rpc_perform_tests(struct spdk_jsonrpc_request *request, const struct spdk_json_v
bdevperf_construct_targets(); bdevperf_construct_targets();
rc = bdevperf_test(); bdevperf_test();
if (rc) {
g_run_rc = rc;
bdevperf_test_done();
}
} }
SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME)