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

bdevperf: Remove task_pool for task management

Browse Source 
This patch is used to remove tht task_pool allocated
by spdk_mempool_create.

Change-Id: I8d3a483477d7fd8b5893baa41b8658893c852f6c
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/388534
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ziye Yang 2017-11-22 16:12:34 +08:00 committed by Jim Harris
parent b9d123b814
commit 7da5c756b7
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/lib/bdev/bdevperf/bdevperf.c
View File

@ -66,7 +66,6 @@ static bool g_run_failed = false;
static bool g_zcopy = true; static bool g_zcopy = true;
static struct spdk_mempool *task_pool; static struct spdk_mempool *task_pool;
static int g_mem_size = 0; static int g_mem_size = 0;
static int g_task_num;
static unsigned g_master_core; static unsigned g_master_core;
static struct spdk_poller *g_perf_timer = NULL; static struct spdk_poller *g_perf_timer = NULL;
@ -129,7 +128,7 @@ bdevperf_free_target(struct io_target *target)
TAILQ_FOREACH_SAFE(task, &target->task_list, link, tmp) { TAILQ_FOREACH_SAFE(task, &target->task_list, link, tmp) {
TAILQ_REMOVE(&target->task_list, task, link); TAILQ_REMOVE(&target->task_list, task, link);
spdk_dma_free(task->buf); spdk_dma_free(task->buf);
spdk_mempool_put(task_pool, task); free(task);
} }
free(target->name); free(target->name);
@ -150,14 +149,6 @@ blockdev_heads_destroy(void)
target = next_target; target = next_target;
} }
} }
if (!task_pool) {
if (spdk_mempool_count(task_pool) != (size_t)g_task_num) {
SPDK_ERRLOG("task_pool count is %zu but should be %d\n",
spdk_mempool_count(task_pool), g_task_num);
}
spdk_mempool_free(task_pool);
}
} }
static void static void
@ -593,13 +584,6 @@ bdevperf_construct_targets_tasks(void)
if (g_reset) { if (g_reset) {
task_num += 1; task_num += 1;
} }
g_task_num = g_target_count * task_num;
task_pool = spdk_mempool_create("task_pool", g_task_num, sizeof(struct bdevperf_task),
64, SPDK_ENV_SOCKET_ID_ANY);
if (!task_pool) {
SPDK_ERRLOG("Cannot allocate %d tasks\n", g_task_num);
goto ret;
}
/* Initialize task list for each target */ /* Initialize task list for each target */
for (i = 0; i < spdk_env_get_core_count(); i++) { for (i = 0; i < spdk_env_get_core_count(); i++) {
@ -609,9 +593,9 @@ bdevperf_construct_targets_tasks(void)
} }
while (target != NULL) { while (target != NULL) {
for (j = 0; j < task_num; j++) { for (j = 0; j < task_num; j++) {
task = spdk_mempool_get(task_pool); task = calloc(1, sizeof(struct bdevperf_task));
if (!task) { if (!task) {
fprintf(stderr, "Get task from task_pool failed\n"); fprintf(stderr, "Failed to allocate task from memory\n");
goto ret; goto ret;
} }