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

bdevperf: inline bdevperf_construct_task_on_job

Browse Source 
Only called from one place.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: I34a9d29d4a45df08ecf168c12bd28e358ed6ff18
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1508
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Ben Walker 2020-03-23 13:56:55 -07:00 committed by Tomasz Zawadzki
parent d424efa822
commit 59e40e0203
1 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1008,41 +1008,6 @@ bdevperf_test(void)
spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_reactor, NULL, NULL); spdk_for_each_channel(&g_bdevperf, bdevperf_submit_on_reactor, NULL, NULL);
} }
static struct bdevperf_task *bdevperf_construct_task_on_job(struct bdevperf_job *job)
{
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_zmalloc(job->buf_size, spdk_bdev_get_buf_align(job->bdev), NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!task->buf) {
fprintf(stderr, "Cannot allocate buf for task=%p\n", task);
free(task);
return NULL;
}
if (spdk_bdev_is_md_separate(job->bdev)) {
task->md_buf = spdk_zmalloc(job->io_size_blocks *
spdk_bdev_get_md_size(job->bdev), 0, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!task->md_buf) {
fprintf(stderr, "Cannot allocate md buf for task=%p\n", task);
free(task->buf);
free(task);
return NULL;
}
}
task->job = job;
return task;
}
static void static void
bdevperf_bdev_removed(void *arg) bdevperf_bdev_removed(void *arg)
{ {
@ -1175,13 +1140,42 @@ bdevperf_construct_job(struct spdk_io_channel_iter *i)
} }
for (n = 0; n < task_num; n++) { for (n = 0; n < task_num; n++) {
task = bdevperf_construct_task_on_job(job); task = calloc(1, sizeof(struct bdevperf_task));
if (task == NULL) { if (!task) {
fprintf(stderr, "Failed to allocate task from memory\n");
spdk_bdev_close(job->bdev_desc); spdk_bdev_close(job->bdev_desc);
bdevperf_free_job(job); bdevperf_free_job(job);
rc = -ENOMEM; rc = -ENOMEM;
goto end; goto end;
} }
task->buf = spdk_zmalloc(job->buf_size, spdk_bdev_get_buf_align(job->bdev), NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!task->buf) {
fprintf(stderr, "Cannot allocate buf for task=%p\n", task);
free(task);
spdk_bdev_close(job->bdev_desc);
bdevperf_free_job(job);
rc = -ENOMEM;
goto end;
}
if (spdk_bdev_is_md_separate(job->bdev)) {
task->md_buf = spdk_zmalloc(job->io_size_blocks *
spdk_bdev_get_md_size(job->bdev), 0, NULL,
SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
if (!task->md_buf) {
fprintf(stderr, "Cannot allocate md buf for task=%p\n", task);
free(task->buf);
free(task);
spdk_bdev_close(job->bdev_desc);
bdevperf_free_job(job);
rc = -ENOMEM;
goto end;
}
}
task->job = job;
TAILQ_INSERT_TAIL(&job->task_list, task, link); TAILQ_INSERT_TAIL(&job->task_list, task, link);
} }