Commit 4579fc9d authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdevperf: bdevperf_construct_targets_tasks() calls bdevperf_test() at its end by swapping 



Creating targets, creating tasks, and then running I/O is the actual
ordering of start-up. So adjust ordering of function calls to make
easier us to follow.

Change the return type of bdevperf_construct_targets_tasks() from
int to void, and call bdevperf_test() at the end of
bdevperf_construct_targets_tasks(). Then replace bdevperf_test() by
bdevperf_construct_targets_tasks().

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Id1396ff4ba199778300f5ddaf79db5f8f2e0ccb6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/642


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 039360d3

test/bdev/bdevperf/bdevperf.c

+32 −42
Original line number Diff line number Diff line
@@ -880,6 +880,23 @@ performance_statistics_thread(void *arg) 
	return -1;

}



static void

bdevperf_test(void)

{

	printf("Running I/O for %" PRIu64 " seconds...\n", g_time_in_usec / 1000000);

	fflush(stdout);



	/* Start a timer to dump performance numbers */

	g_shutdown_tsc = spdk_get_ticks();

	if (g_show_performance_real_time) {

		g_perf_timer = spdk_poller_register(performance_statistics_thread, NULL,

						    g_show_performance_period_in_usec);

	}



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

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

}



static struct bdevperf_task *bdevperf_construct_task_on_target(struct io_target *target)

{

	struct bdevperf_task *task;
@@ -915,7 +932,7 @@ static struct bdevperf_task *bdevperf_construct_task_on_target(struct io_target 
	return task;

}



static int

static void

bdevperf_construct_targets_tasks(void)

{

	struct io_target_group *group;
@@ -923,6 +940,13 @@ bdevperf_construct_targets_tasks(void) 
	struct bdevperf_task *task;

	int i, task_num = g_queue_depth;



	if (g_target_count == 0) {

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

		g_run_rc = -ENODEV;

		bdevperf_test_done();

		return;

	}



	if (g_reset) {

		task_num += 1;

	}
@@ -933,52 +957,18 @@ bdevperf_construct_targets_tasks(void) 
			for (i = 0; i < task_num; i++) {

				task = bdevperf_construct_task_on_target(target);

				if (task == NULL) {

					goto ret;

				}

				TAILQ_INSERT_TAIL(&target->task_list, task, link);

			}

		}

	}



	return 0;



ret:

					fprintf(stderr, "Bdevperf program exits due to memory allocation issue\n");

					fprintf(stderr, "Use -d XXX to allocate more huge pages, e.g., -d 4096\n");

	return -1;

}



static void

bdevperf_test(void)

{

	int rc;



	if (g_target_count == 0) {

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

		g_run_rc = -ENODEV;

					g_run_rc = -1;

					bdevperf_test_done();

					return;

				}



	rc = bdevperf_construct_targets_tasks();

	if (rc) {

		g_run_rc = rc;

		bdevperf_test_done();

		return;

				TAILQ_INSERT_TAIL(&target->task_list, task, link);

			}

		}



	printf("Running I/O for %" PRIu64 " seconds...\n", g_time_in_usec / 1000000);

	fflush(stdout);



	/* Start a timer to dump performance numbers */

	g_shutdown_tsc = spdk_get_ticks();

	if (g_show_performance_real_time) {

		g_perf_timer = spdk_poller_register(performance_statistics_thread, NULL,

						    g_show_performance_period_in_usec);

	}



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

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

	bdevperf_test();

}



static void
@@ -1124,7 +1114,7 @@ bdevperf_construct_targets(void) 
	}



end:

	bdevperf_test();

	bdevperf_construct_targets_tasks();

}



static int