move files: all cache stuff is in lib/cache/ now

Almost.  A trivial lib/layer/cache.c remains.
I put all lib/generic/*.h into libkres_HEADERS, to be sure.
They rarely change anyway.

diff --git a/daemon/bindings.c b/daemon/bindings.c
index a2e8c9ec225225ca2be1d3a717e60e3863703460..bac13c2f44819c78d4733a96a3949b04ab51360f 100644 (file)
--- a/daemon/bindings.c
+++ b/daemon/bindings.c
@@ -20,8 +20,8 @@
 #include <contrib/cleanup.h>
 #include <libknot/descriptor.h>
 
-#include "lib/cache.h"
-#include "lib/cdb.h"
+#include "lib/cache/api.h"
+#include "lib/cache/cdb_api.h"
 #include "lib/utils.h"
 #include "daemon/bindings.h"
 #include "daemon/worker.h"

diff --git a/daemon/engine.c b/daemon/engine.c
index 2705c6c4ebaca18d15035006cf45429d9d02db9a..c86bc68c6839dc393c74b03a2d250b313361834b 100644 (file)
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -28,9 +28,9 @@
 #include "daemon/bindings.h"
 #include "daemon/ffimodule.h"
 #include "lib/nsrep.h"
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 #include "lib/defines.h"
-#include "lib/cdb_lmdb.h"
+#include "lib/cache/cdb_lmdb.h"
 #include "lib/dnssec/ta.h"
 
 /** @internal Compatibility wrapper for Lua < 5.2 */

diff --git a/lib/cache.c b/lib/cache/api.c
similarity index 99%
rename from lib/cache.c
rename to lib/cache/api.c
index 5ea2bf77ecbc7dc9d498ac1b1a778b0b2efda404..dd61ff981395b0e4c7307647e81fc7694bb054d5 100644 (file)
--- a/lib/cache.c
+++ b/lib/cache/api.c
@@ -29,8 +29,8 @@
 
 #include "contrib/ucw/lib.h"
 #include "contrib/cleanup.h"
-#include "lib/cache.h"
-#include "lib/cdb_lmdb.h"
+#include "lib/cache/api.h"
+#include "lib/cache/cdb_lmdb.h"
 #include "lib/defines.h"
 #include "lib/utils.h"
 

diff --git a/lib/cache.h b/lib/cache/api.h
similarity index 99%
rename from lib/cache.h
rename to lib/cache/api.h
index 09a382201ef1b8562c4fc911b36e2f9ccba3851b..40f24730c3063708533e407bf2f64a6ddd5fe2e1 100644 (file)
--- a/lib/cache.h
+++ b/lib/cache/api.h
@@ -19,7 +19,7 @@
 #include <libknot/consts.h>
 #include <libknot/rrset.h>
 #include <sys/time.h>
-#include "lib/cdb.h"
+#include "lib/cache/cdb_api.h"
 #include "lib/defines.h"
 #include "contrib/ucw/config.h" /*uint*/
 

diff --git a/lib/cdb.h b/lib/cache/cdb_api.h
similarity index 100%
rename from lib/cdb.h
rename to lib/cache/cdb_api.h

diff --git a/lib/cdb_lmdb.c b/lib/cache/cdb_lmdb.c
similarity index 99%
rename from lib/cdb_lmdb.c
rename to lib/cache/cdb_lmdb.c
index 8af549460ae5b354e2cae6fa8268ecceac216295..079b1f4bfe3fba86b616a54ede7fb3a31d4aa749 100644 (file)
--- a/lib/cdb_lmdb.c
+++ b/lib/cache/cdb_lmdb.c
@@ -25,8 +25,8 @@
 #include <lmdb.h>
 
 #include "contrib/cleanup.h"
-#include "lib/cdb_lmdb.h"
-#include "lib/cache.h"
+#include "lib/cache/cdb_lmdb.h"
+#include "lib/cache/api.h"
 #include "lib/utils.h"
 
 

diff --git a/lib/cdb_lmdb.h b/lib/cache/cdb_lmdb.h
similarity index 96%
rename from lib/cdb_lmdb.h
rename to lib/cache/cdb_lmdb.h
index 7393eb065a859cdb6c19e53a0735d75851856e9c..bc2c7d62a0c09579a33f61fe8a4895b6a7e2cc8d 100644 (file)
--- a/lib/cdb_lmdb.h
+++ b/lib/cache/cdb_lmdb.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "lib/cdb.h"
+#include "lib/cache/cdb_api.h"
 #include "lib/defines.h"
 
 KR_EXPORT KR_CONST

diff --git a/lib/cache/impl.h b/lib/cache/impl.h
index a3abfb2c8b089ef830e51f0cfe81251ea25a08a5..0ab531cfd0c98ef135614c7adeb0d230d5b580f8 100644 (file)
--- a/lib/cache/impl.h
+++ b/lib/cache/impl.h
@@ -28,7 +28,7 @@
 #include <libknot/dname.h>
 
 #include "contrib/cleanup.h"
-#include "lib/cdb.h"
+#include "lib/cache/cdb_api.h"
 #include "lib/resolve.h"
 
 /** Cache entry header

diff --git a/lib/layer/cache.c b/lib/layer/cache.c
index 288ff861b2b7b8f633ea48f5b8b81b21b73481a1..c7bbc1ab6fa6ea2c9daf1025b7b45928cb9857ee 100644 (file)
--- a/lib/layer/cache.c
+++ b/lib/layer/cache.c
@@ -15,7 +15,7 @@
  */
 
 #include "lib/module.h"
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 
 /** Module implementation. */
 const kr_layer_api_t *cache_layer(struct kr_module *module)

diff --git a/lib/lib.mk b/lib/lib.mk
index 4889a6ec5485c295b504db736aed5ef93edd21fa..c3256831dd0f4445507db8b6bbdd1c790ad0abff 100644 (file)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -1,48 +1,52 @@
 libkres_SOURCES := \
-       lib/generic/lru.c      \
-       lib/generic/map.c      \
-       lib/layer/iterate.c    \
-       lib/layer/validate.c   \
-       lib/layer/cache.c \
-       lib/dnssec/nsec.c      \
-       lib/dnssec/nsec3.c     \
-       lib/dnssec/signature.c \
-       lib/dnssec/ta.c        \
-       lib/dnssec.c           \
-       lib/utils.c            \
-       lib/nsrep.c            \
-       lib/module.c           \
-       lib/resolve.c          \
-       lib/zonecut.c          \
-       lib/rplan.c            \
-       lib/cache.c            \
+       lib/cache/api.c \
+       lib/cache/cdb_lmdb.c \
        lib/cache/entry_list.c \
-       lib/cache/entry_pkt.c  \
-       lib/cache/entry_rr.c   \
-       lib/cache/knot_pkt.c   \
-       lib/cache/nsec1.c      \
-       lib/cdb_lmdb.c
+       lib/cache/entry_pkt.c \
+       lib/cache/entry_rr.c \
+       lib/cache/knot_pkt.c \
+       lib/cache/nsec1.c \
+       lib/dnssec.c \
+       lib/dnssec/nsec.c \
+       lib/dnssec/nsec3.c \
+       lib/dnssec/signature.c \
+       lib/dnssec/ta.c \
+       lib/generic/lru.c \
+       lib/generic/map.c \
+       lib/layer/cache.c \
+       lib/layer/iterate.c \
+       lib/layer/validate.c \
+       lib/module.c \
+       lib/nsrep.c \
+       lib/resolve.c \
+       lib/rplan.c \
+       lib/utils.c \
+       lib/zonecut.c
 
 libkres_HEADERS := \
-       lib/generic/array.h    \
-       lib/generic/lru.h      \
-       lib/generic/map.h      \
-       lib/generic/set.h      \
-       lib/layer.h            \
-       lib/dnssec/nsec.h      \
-       lib/dnssec/nsec3.h     \
+       lib/cache/api.h \
+       lib/cache/cdb_api.h \
+       lib/cache/cdb_lmdb.h \
+       lib/cache/impl.h \
+       lib/defines.h \
+       lib/dnssec.h \
+       lib/dnssec/nsec.h \
+       lib/dnssec/nsec3.h \
        lib/dnssec/signature.h \
-       lib/dnssec/ta.h        \
-       lib/dnssec.h           \
-       lib/utils.h            \
-       lib/nsrep.h            \
-       lib/module.h           \
-       lib/resolve.h          \
-       lib/zonecut.h          \
-       lib/rplan.h            \
-       lib/cache.h            \
-       lib/cdb.h              \
-       lib/cdb_lmdb.h
+       lib/dnssec/ta.h \
+       lib/generic/array.h \
+       lib/generic/lru.h \
+       lib/generic/map.h \
+       lib/generic/pack.h \
+       lib/generic/set.h \
+       lib/layer.h \
+       lib/layer/iterate.h \
+       lib/module.h \
+       lib/nsrep.h \
+       lib/resolve.h \
+       lib/rplan.h \
+       lib/utils.h \
+       lib/zonecut.h
 
 # Dependencies
 libkres_DEPEND := $(contrib)

diff --git a/lib/resolve.h b/lib/resolve.h
index f67ee54ab3d1ba18542a915b8bf4f87455332788..04f2a11e1df8617087920d34e0bb5f48874e18f2 100644 (file)
--- a/lib/resolve.h
+++ b/lib/resolve.h
@@ -28,7 +28,7 @@
 #include "lib/nsrep.h"
 #include "lib/rplan.h"
 #include "lib/module.h"
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 
 /**
  * @file resolve.h

diff --git a/lib/rplan.c b/lib/rplan.c
index 0a4f8e0992706939d1159ad423a483785e224dd7..e18d96a13aa9204277ac9376c345160300e6cb66 100644 (file)
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -19,7 +19,7 @@
 
 #include "lib/rplan.h"
 #include "lib/resolve.h"
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 #include "lib/defines.h"
 #include "lib/layer.h"
 

diff --git a/lib/rplan.h b/lib/rplan.h
index 1e45f4576b791b4a5b1664f5d35630c062cf303b..52b3e242c161e96489b3f31d05b1c067018c9de9 100644 (file)
--- a/lib/rplan.h
+++ b/lib/rplan.h
@@ -20,7 +20,7 @@
 #include <libknot/dname.h>
 #include <libknot/codes.h>
 
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 #include "lib/zonecut.h"
 #include "lib/nsrep.h"
 

diff --git a/lib/zonecut.h b/lib/zonecut.h
index 0cee82fb13cf1b526aad101af79f431f0f1d102c..8d48a6f75346bda867d7db3fc3cfc4ed3382c876 100644 (file)
--- a/lib/zonecut.h
+++ b/lib/zonecut.h
@@ -19,7 +19,7 @@
 #include "lib/generic/map.h"
 #include "lib/generic/pack.h"
 #include "lib/defines.h"
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 
 struct kr_rplan;
 struct kr_context;

diff --git a/modules/memcached/cdb_memcached.c b/modules/memcached/cdb_memcached.c
index 0290a26ad69c05c24c83e35ffb60236b402378cb..4832cfea33b9b84e6846876a49194cd380ea7826 100644 (file)
--- a/modules/memcached/cdb_memcached.c
+++ b/modules/memcached/cdb_memcached.c
@@ -27,8 +27,8 @@
 #include "contrib/cleanup.h"
 
 #include "lib/generic/array.h"
-#include "lib/cdb.h"
-#include "lib/cache.h"
+#include "lib/cache/cdb_api.h"
+#include "lib/cache/api.h"
 #include "lib/utils.h"
 
 /* memcached client */

diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c
index acb31fb2300fc69d6260425872520fe33446b060..dfd85aeacd54553cf9efa4df87a682d71ca17eb3 100644 (file)
--- a/modules/memcached/memcached.c
+++ b/modules/memcached/memcached.c
@@ -17,9 +17,9 @@
 #include <contrib/cleanup.h>
 
 #include "daemon/engine.h"
-#include "lib/cdb.h"
+#include "lib/cache/cdb_api.h"
 #include "lib/module.h"
-#include "lib/cache.h"
+#include "lib/cache/api.h"
 
 /** @internal Redis API */
 const struct kr_cdb_api *cdb_memcached(void);

diff --git a/modules/redis/cdb_redis.c b/modules/redis/cdb_redis.c
index 262c0f93d25919c4f54e2973cb9a97a95e743f68..e3f1ab8748b9f4fa07d869ef6589b78ce589f956 100644 (file)
--- a/modules/redis/cdb_redis.c
+++ b/modules/redis/cdb_redis.c
@@ -28,7 +28,7 @@
 #include "contrib/ucw/lib.h"
 
 
-#include "lib/cdb.h"
+#include "lib/cache/cdb_api.h"
 #include "lib/cache.h"
 #include "lib/utils.h"
 #include "lib/defines.h"

diff --git a/tests/test_cache.c b/tests/test_cache.c
index e2c756073ab7a505a05ce6316b814c0edcd56704..47dafc5005c3a5aaf65785eb0219bac16d04cd36 100644 (file)
--- a/tests/test_cache.c
+++ b/tests/test_cache.c
@@ -21,7 +21,7 @@
 
 #include "tests/test.h"
 #include "lib/cache.h"
-#include "lib/cdb_lmdb.h"
+#include "lib/cache/cdb_lmdb.h"