[PATCH 2/8] vinyl: don't use mempool for allocating background tasks
Vladimir Davydov
vdavydov.dev at gmail.com
Tue Sep 4 20:23:45 MSK 2018
Background tasks are allocated infrequently, not more often than once
per several seconds, so using mempool for them is unnecessary and only
clutters vy_scheduler struct. Let's allocate them with malloc().
---
src/box/vy_scheduler.c | 14 +++++---------
src/box/vy_scheduler.h | 4 ----
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c
index 367c8a20..fc4fdf8c 100644
--- a/src/box/vy_scheduler.c
+++ b/src/box/vy_scheduler.c
@@ -36,7 +36,6 @@
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
-#include <small/mempool.h>
#include <small/rlist.h>
#include <tarantool_ev.h>
@@ -233,10 +232,10 @@ static struct vy_task *
vy_task_new(struct vy_scheduler *scheduler, struct vy_lsm *lsm,
const struct vy_task_ops *ops)
{
- struct vy_task *task = mempool_alloc(&scheduler->task_pool);
+ struct vy_task *task = calloc(1, sizeof(*task));
if (task == NULL) {
diag_set(OutOfMemory, sizeof(*task),
- "mempool", "struct vy_task");
+ "malloc", "struct vy_task");
return NULL;
}
memset(task, 0, sizeof(*task));
@@ -245,13 +244,13 @@ vy_task_new(struct vy_scheduler *scheduler, struct vy_lsm *lsm,
task->lsm = lsm;
task->cmp_def = key_def_dup(lsm->cmp_def);
if (task->cmp_def == NULL) {
- mempool_free(&scheduler->task_pool, task);
+ free(task);
return NULL;
}
task->key_def = key_def_dup(lsm->key_def);
if (task->key_def == NULL) {
key_def_delete(task->cmp_def);
- mempool_free(&scheduler->task_pool, task);
+ free(task);
return NULL;
}
vy_lsm_ref(lsm);
@@ -270,7 +269,7 @@ vy_task_delete(struct vy_task *task)
key_def_delete(task->key_def);
vy_lsm_unref(task->lsm);
diag_destroy(&task->diag);
- mempool_free(&task->scheduler->task_pool, task);
+ free(task);
}
static bool
@@ -397,8 +396,6 @@ vy_scheduler_create(struct vy_scheduler *scheduler, int write_threads,
fiber_cond_create(&scheduler->scheduler_cond);
scheduler->worker_pool_size = write_threads;
- mempool_create(&scheduler->task_pool, cord_slab_cache(),
- sizeof(struct vy_task));
stailq_create(&scheduler->idle_workers);
stailq_create(&scheduler->processed_tasks);
@@ -424,7 +421,6 @@ vy_scheduler_destroy(struct vy_scheduler *scheduler)
vy_scheduler_stop_workers(scheduler);
diag_destroy(&scheduler->diag);
- mempool_destroy(&scheduler->task_pool);
fiber_cond_destroy(&scheduler->dump_cond);
fiber_cond_destroy(&scheduler->scheduler_cond);
vy_dump_heap_destroy(&scheduler->dump_heap);
diff --git a/src/box/vy_scheduler.h b/src/box/vy_scheduler.h
index 89f8f170..db85711a 100644
--- a/src/box/vy_scheduler.h
+++ b/src/box/vy_scheduler.h
@@ -34,9 +34,7 @@
#include <assert.h>
#include <stdbool.h>
#include <stdint.h>
-#include <small/mempool.h>
#include <small/rlist.h>
-#include <tarantool_ev.h>
#include "diag.h"
#include "fiber_cond.h"
@@ -74,8 +72,6 @@ struct vy_scheduler {
int idle_worker_count;
/** List of idle workers, linked by vy_worker::in_idle. */
struct stailq idle_workers;
- /** Memory pool used for allocating vy_task objects. */
- struct mempool task_pool;
/** Queue of processed tasks, linked by vy_task::in_processed. */
struct stailq processed_tasks;
/**
--
2.11.0
More information about the Tarantool-patches
mailing list