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

bdevperf: Factor out creating tasks on group into a helper function

Browse Source 
This is a preparation to make bdevperf_construct_targets_tasks()
asynchronous by using spdk_for_each_channel() in the next patch.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I76c827550b2920abcba14abd7f15a3111ad10d39
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/643
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-02-09 21:32:54 -05:00 committed by Tomasz Zawadzki
parent 52d8f11ea8
commit 19367440b6
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -939,13 +939,35 @@ static struct bdevperf_task *bdevperf_construct_task_on_target(struct io_target
return task; return task;
} }
static int
bdevperf_construct_tasks_on_group(struct io_target_group *group)
{
struct io_target *target;
struct bdevperf_task *task;
int i, task_num = g_queue_depth;
if (g_reset) {
task_num += 1;
}
TAILQ_FOREACH(target, &group->targets, link) {
for (i = 0; i < task_num; i++) {
task = bdevperf_construct_task_on_target(target);
if (task == NULL) {
return -1;
}
TAILQ_INSERT_TAIL(&target->task_list, task, link);
}
}
return 0;
}
static void static void
bdevperf_construct_targets_tasks(void) bdevperf_construct_targets_tasks(void)
{ {
struct io_target_group *group; struct io_target_group *group;
struct io_target *target; int rc;
struct bdevperf_task *task;
int i, task_num = g_queue_depth;
if (g_target_count == 0) { if (g_target_count == 0) {
fprintf(stderr, "No valid bdevs found.\n"); fprintf(stderr, "No valid bdevs found.\n");
@ -954,25 +976,16 @@ bdevperf_construct_targets_tasks(void)
return; return;
} }
if (g_reset) {
task_num += 1;
}
/* Initialize task list for each target */ /* Initialize task list for each target */
TAILQ_FOREACH(group, &g_bdevperf.groups, link) { TAILQ_FOREACH(group, &g_bdevperf.groups, link) {
TAILQ_FOREACH(target, &group->targets, link) { rc = bdevperf_construct_tasks_on_group(group);
for (i = 0; i < task_num; i++) { if (rc != 0) {
task = bdevperf_construct_task_on_target(target);
if (task == NULL) {
fprintf(stderr, "Bdevperf program exits due to memory allocation issue\n"); 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"); fprintf(stderr, "Use -d XXX to allocate more huge pages, e.g., -d 4096\n");
g_run_rc = -1; g_run_rc = rc;
bdevperf_test_done(); bdevperf_test_done();
return; return;
} }
TAILQ_INSERT_TAIL(&target->task_list, task, link);
}
}
} }
bdevperf_test(); bdevperf_test();