Revert "daemon/worker: ring buffer to recycle mempools"

This reverts commit 91a2945e631b673942ffe62992e03913925a63da.

Conflicts:
	daemon/worker.h

diff --git a/daemon/engine.h b/daemon/engine.h
index 8a0d460e1d4993dd7a38667019b143ebb1062b1c..2f3b0794c54c270cd390168bd7744a62aa7bca02 100644 (file)
--- a/daemon/engine.h
+++ b/daemon/engine.h
@@ -20,9 +20,6 @@
 #ifndef DEFAULT_NSREP_SIZE
 #define DEFAULT_NSREP_SIZE 4096 /**< Default NS reputation cache size */
 #endif
-#ifndef DEFAULT_RING_SIZE
-#define DEFAULT_RING_SIZE 16 /**< Maximum size of the worker ring size */
-#endif
 
 /*
  * @internal These are forward decls to allow building modules with engine but without Lua.

diff --git a/daemon/main.c b/daemon/main.c
index 03dbb85d8b851ecab66e0d0840252e4c5662546c..d7125381dccc14f4e4317fa29d46ab9f4d58021a 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -150,8 +150,6 @@ int main(int argc, char **argv)
                .mm = NULL,
        };
        loop->data = &worker;
-       array_init(worker.bufs.ring);
-       worker_reserve(&worker, DEFAULT_RING_SIZE);
 
        /* Bind to sockets. */
        if (addr != NULL) {
@@ -184,7 +182,6 @@ int main(int argc, char **argv)
        /* Cleanup. */
        fprintf(stderr, "\n[system] quitting\n");
        engine_deinit(&engine);
-       worker_reclaim(&worker);
 
        if (ret != 0) {
                ret = EXIT_FAILURE;

diff --git a/daemon/worker.c b/daemon/worker.c
index b642fddee620b47ebc6bc3e6a8b5b993083da3a3..4bc787b167116e6ddabc7a2ded1eaca4b4c48bd4 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -27,7 +27,6 @@
 struct qr_task
 {
        struct kr_request req;
-       struct worker_ctx *worker;
        knot_pkt_t *next_query;
        uv_handle_t *next_handle;
        uv_timer_t timeout;
@@ -63,15 +62,8 @@ static int parse_query(knot_pkt_t *query)
 
 static struct qr_task *qr_task_create(struct worker_ctx *worker, uv_handle_t *handle, knot_pkt_t *query, const struct sockaddr *addr)
 {
-       /* Recycle mempool from ring or create it */
        mm_ctx_t pool;
-       mempool_ring_t *ring = &worker->bufs.ring;
-       if (ring->len > 0) {
-               pool = array_tail(*ring);
-               array_pop(*ring);
-       } else {
-               mm_ctx_mempool(&pool, KNOT_WIRE_MAX_PKTSIZE);
-       }
+       mm_ctx_mempool(&pool, MM_DEFAULT_BLKSIZE);
 
        /* Create worker task */
        struct engine *engine = worker->engine;
@@ -81,7 +73,6 @@ static struct qr_task *qr_task_create(struct worker_ctx *worker, uv_handle_t *ha
                mp_delete(pool.ctx);
                return NULL;
        }
-       task->worker = worker;
        task->req.pool = pool;
        task->source.handle = handle;
        if (addr) {
@@ -127,15 +118,7 @@ static void qr_task_free(uv_handle_t *handle)
                uv_ref(task->source.handle);
                io_start_read(task->source.handle);
        }
-       /* Return mempool to ring or free it if it's full */
-       struct worker_ctx *worker = task->worker;
-       mempool_ring_t *ring = &worker->bufs.ring;
-       if (ring->len < ring->cap) {
-               mp_flush(task->req.pool.ctx);
-               array_push(*ring, task->req.pool);
-       } else {
-               mp_delete(task->req.pool.ctx);
-       }
+       mp_delete(task->req.pool.ctx);
 }
 
 static void qr_task_timeout(uv_timer_t *req)
@@ -279,17 +262,3 @@ int worker_exec(struct worker_ctx *worker, uv_handle_t *handle, knot_pkt_t *quer
        /* Consume input and produce next query */
        return qr_task_step(task, query);
 }
-
-int worker_reserve(struct worker_ctx *worker, size_t ring_maxlen)
-{
-       return array_reserve(worker->bufs.ring, ring_maxlen);
-}
-
-void worker_reclaim(struct worker_ctx *worker)
-{
-       mempool_ring_t *ring = &worker->bufs.ring;
-       for (unsigned i = 0; i < ring->len; ++i) {
-               mp_delete(ring->at[i].ctx);
-       }
-       array_clear(*ring);
-}

diff --git a/daemon/worker.h b/daemon/worker.h
index ba95372c0a711392b15c66ce6d06ece58eaf545f..1f6afae23bd293c741b4cd6380036e2b2f009734 100644 (file)
--- a/daemon/worker.h
+++ b/daemon/worker.h
@@ -19,11 +19,6 @@
 #include <libknot/internal/mempattern.h>
 
 #include "daemon/engine.h"
-#include "lib/generic/array.h"
-
-/* @cond internal Array of memory pools. */
-typedef array_t(mm_ctx_t) mempool_ring_t;
-/* @endcond */
 
 /**
  * Query resolution worker.
@@ -34,7 +29,6 @@ struct worker_ctx {
        mm_ctx_t *mm;
        struct {
                uint8_t wire[KNOT_WIRE_MAX_PKTSIZE];
-               mempool_ring_t ring;
        } bufs;
 };
 
@@ -49,9 +43,3 @@ struct worker_ctx {
  * @return 0, error code
  */
 int worker_exec(struct worker_ctx *worker, uv_handle_t *handle, knot_pkt_t *query, const struct sockaddr* addr);
-
-/** Reserve worker buffers */
-int worker_reserve(struct worker_ctx *worker, size_t ring_maxlen);
-
-/** Collect worker mempools */
-void worker_reclaim(struct worker_ctx *worker);