From 9e97d7f2460f271301dacf60852a806261e44a78 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Fri, 5 Jun 2015 17:29:30 +0200
Subject: [PATCH] Revert "daemon/worker: ring buffer to recycle mempools"

This reverts commit 91a2945e631b673942ffe62992e03913925a63da.

Conflicts:
	daemon/worker.h
---
 daemon/engine.h |  3 ---
 daemon/main.c   |  3 ---
 daemon/worker.c | 35 ++---------------------------------
 daemon/worker.h | 12 ------------
 4 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/daemon/engine.h b/daemon/engine.h
index 8a0d460e1..2f3b0794c 100644
--- 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 03dbb85d8..d7125381d 100644
--- 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 b642fddee..4bc787b16 100644
--- 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 ba95372c0..1f6afae23 100644
--- 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);
-- 
2.47.3