Commit 5780ad96 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

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



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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I30fe38cfb73fbc593d079d5b66a540c0ce96fe19
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/636


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 3673217a

test/bdev/bdevperf/bdevperf.c

+9 −20
Original line number Diff line number Diff line
@@ -948,19 +948,23 @@ ret: 
	return -1;

}



static int

static void

bdevperf_test(void)

{

	int rc;



	if (g_target_count == 0) {

		fprintf(stderr, "No valid bdevs found.\n");

		return -ENODEV;

		g_run_rc = -ENODEV;

		bdevperf_test_done();

		return;

	}



	rc = bdevperf_construct_targets_tasks();

	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);
@@ -975,8 +979,6 @@ bdevperf_test(void) 


	/* Iterate target groups to start all I/O */

	spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_group, NULL, NULL);



	return 0;

}



static void
@@ -1141,8 +1143,6 @@ io_target_group_destroy(void *io_device, void *ctx_buf) 
static void

_bdevperf_init_thread_done(void *ctx)

{

	int rc;



	g_master_thread = spdk_get_thread();



	if (g_wait_for_tests) {
@@ -1152,12 +1152,7 @@ _bdevperf_init_thread_done(void *ctx) 


	bdevperf_construct_targets();



	rc = bdevperf_test();

	if (rc) {

		g_run_rc = rc;

		bdevperf_test_done();

		return;

	}

	bdevperf_test();

}



static void
@@ -1206,8 +1201,6 @@ rpc_perform_tests_cb(void) 
static void

rpc_perform_tests(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params)

{

	int rc;



	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "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();



	rc = bdevperf_test();

	if (rc) {

		g_run_rc = rc;

		bdevperf_test_done();

	}

	bdevperf_test();

}

SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME)