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

bdevperf: Factoring out construct task on target operation into a function

Browse Source 
The possible reason of failure of task construction is out of memory.
Hence it's OK to return pointer to the constructed task simply.

Change-Id: If6e270caefb61192c8f0055506d957c3c5d07016
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/443355
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-02-11 08:02:48 +09:00 committed by Changpeng Liu
parent fdf7e1bcb2
commit 530ae91505
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,6 +694,28 @@ performance_statistics_thread(void *arg)
return -1;
}
static struct bdevperf_task *bdevperf_construct_task_on_target(struct io_target *target)
{
struct bdevperf_task *task;
task = calloc(1, sizeof(struct bdevperf_task));
if (!task) {
fprintf(stderr, "Failed to allocate task from memory\n");
return NULL;
}
task->buf = spdk_dma_zmalloc(g_io_size, g_min_alignment, NULL);
if (!task->buf) {
fprintf(stderr, "Cannot allocate buf for task=%p\n", task);
free(task);
return NULL;
}
task->target = target;
return task;
}
static int
bdevperf_construct_targets_tasks(void)
{
@ -719,20 +741,10 @@ bdevperf_construct_targets_tasks(void)
}
while (target != NULL) {
for (j = 0; j < task_num; j++) {
task = calloc(1, sizeof(struct bdevperf_task));
if (!task) {
fprintf(stderr, "Failed to allocate task from memory\n");
task = bdevperf_construct_task_on_target(target);
if (task == NULL) {
goto ret;
}
task->buf = spdk_dma_zmalloc(g_io_size, g_min_alignment, NULL);
if (!task->buf) {
fprintf(stderr, "Cannot allocate buf for task=%p\n", task);
free(task);
goto ret;
}
task->target = target;
TAILQ_INSERT_TAIL(&target->task_list, task, link);
}
target = target->next;