lib/rrcache: renamed itercache to rrcache

daemon/engine.c

@@ -118,7 +118,7 @@ static int init_resolver(struct engine *engine)
 
 	/* Load basic modules */
 	engine_register(engine, "iterate");
-	engine_register(engine, "itercache");
+	engine_register(engine, "rrcache");
 	engine_register(engine, "pktcache");
 
 	/* Initialize storage backends */

lib/README.rst

@@ -33,7 +33,7 @@ Writing layers
 
 The resolver :ref:`library <lib_index>` leverages the `processing API`_ from the libknot to separate packet processing code
 into layers. In order to keep the core library sane and coverable, there are only two built-in layers:
-the :c:func:`iterate_layer`, and the :c:func:`itercache_layer`.
+the :c:func:`iterate_layer`, and the :c:func:`rrcache_layer`.
 
 *Note* |---| This is only crash-course in the library internals, see the resolver :ref:`library <lib_index>` documentation for the complete overview of the services.
 

lib/layer/itercache.c → lib/layer/rrcache.c

@@ -247,7 +247,7 @@ static int stash(knot_layer_t *ctx, knot_pkt_t *pkt)
 }
 
 /** Module implementation. */
-const knot_layer_api_t *itercache_layer(void)
+const knot_layer_api_t *rrcache_layer(void)
 {
 	static const knot_layer_api_t _layer = {
 		.begin = &begin,
@@ -258,4 +258,4 @@ const knot_layer_api_t *itercache_layer(void)
 	return &_layer;
 }
 
-KR_MODULE_EXPORT(itercache)
+KR_MODULE_EXPORT(rrcache)

lib/layer/itercache.h → lib/layer/rrcache.h

@@ -19,4 +19,4 @@
 #include "lib/layer.h"
 
 /* Processing module implementation. */
-extern const knot_layer_api_t *itercache_layer(void);
+extern const knot_layer_api_t *rrcache_layer(void);

lib/lib.mk

@@ -6,7 +6,7 @@ libkresolve_SOURCES := \
 	$(ccan_EMBED)          \
 	lib/generic/map.c      \
 	lib/layer/iterate.c    \
-	lib/layer/itercache.c  \
+	lib/layer/rrcache.c    \
 	lib/layer/pktcache.c   \
 	lib/utils.c            \
 	lib/nsrep.c            \

lib/resolve.c

@@ -22,10 +22,9 @@
 #include <libknot/descriptor.h>
 #include <libknot/internal/net.h>
 
+#include "lib/layer.h"
 #include "lib/rplan.h"
 #include "lib/resolve.h"
-#include "lib/layer/itercache.h"
-#include "lib/layer/iterate.h"
 
 #define DEBUG_MSG(fmt...) QRDEBUG(kr_rplan_current(rplan), "resl",  fmt)
 

lib/resolve.h

@@ -42,7 +42,7 @@
  *
  * // Push basic layers
  * array_push(ctx.layers, iterate_layer);
- * array_push(ctx.layers, itercache_layer);
+ * array_push(ctx.layers, rrcache_layer);
  *
  * // Resolve "IN A cz."
  * knot_pkt_t *answer = knot_pkt_new(NULL, 65535, ctx.pool);

tests/test_integration.c

@@ -57,7 +57,7 @@ static PyObject* init(PyObject* self, PyObject* args)
 		return NULL;
 	}
 	kr_module_load(&global_modules.at[0], "iterate", NULL);
-	kr_module_load(&global_modules.at[1], "itercache", NULL);
+	kr_module_load(&global_modules.at[1], "rrcache", NULL);
 	global_modules.len = 2;
 
 	/* Initialize resolution context */