From: Libor Peltan <libor.peltan@nic.cz>
Date: Fri, 4 May 2018 17:06:09 +0000 (+0200)
Subject: kr_cache_gc: improvements, mostly categories
X-Git-Tag: v4.1.0^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b30afae5a3ea5c39d8d22da926221c45a41741f8;p=thirdparty%2Fknot-resolver.git

kr_cache_gc: improvements, mostly categories
---

diff --git a/utils/kr_cache_gc/categories.c b/utils/kr_cache_gc/categories.c
index 57c3f2fad..db4a7104e 100644
--- a/utils/kr_cache_gc/categories.c
+++ b/utils/kr_cache_gc/categories.c
@@ -2,23 +2,44 @@
 
 #include <libknot/libknot.h>
 
-// TODO this is just an example, make this more clever
-category_t kr_gc_categorize(gc_record_info_t *info)
+static bool rrtype_is_infrastructure(uint16_t r)
 {
-	category_t res = 60;
-
-	switch (info->rrtype) {
+	switch (r) {
 	case KNOT_RRTYPE_NS:
 	case KNOT_RRTYPE_DS:
 	case KNOT_RRTYPE_DNSKEY:
 	case KNOT_RRTYPE_A:
 	case KNOT_RRTYPE_AAAA:
+		return true;
+	default:
+		return false;
+	}
+}
+
+// TODO this is just an example, make this more clever
+category_t kr_gc_categorize(gc_record_info_t *info)
+{
+	category_t res = 60;
+
+	switch (info->no_labels) {
+	case 0:
+		return 1;
+	case 1:
+		return 2;
+	case 2:
+		return (rrtype_is_infrastructure(info->rrtype) ? 3 : 20);
+	}
+
+	if (info->entry_size > 300) {
+		return 90;
+	}
+
+	if (rrtype_is_infrastructure(info->rrtype)) {
 		if (info->expires_in > 0) {
 			res = 30;
 		} else {
 			res = 45;
 		}
-		break;
 	}
 
 	return res;
diff --git a/utils/kr_cache_gc/db.c b/utils/kr_cache_gc/db.c
index d05262451..c90e106b9 100644
--- a/utils/kr_cache_gc/db.c
+++ b/utils/kr_cache_gc/db.c
@@ -3,6 +3,7 @@
 #include <lib/cache/impl.h>
 //#include <lib/defines.h>
 
+#include <time.h>
 #include <sys/stat.h>
 
 struct libknot_lmdb_env
@@ -130,8 +131,7 @@ int kr_gc_cache_iter(knot_db_t *knot_db, kr_gc_iter_callback callback, void *ctx
 	knot_db_iter_t *it = NULL;
 	const knot_db_api_t *api = knot_db_lmdb_api();
 	gc_record_info_t info = { 0 };
-	// TODO remove and use time(NULL) ! this is just for debug with pre-generated cache
-	int64_t now = 1524301784;
+	int64_t now = time(NULL);
 
 	int ret = api->txn_begin(knot_db, &txn, KNOT_DB_RDONLY);
 	if (ret != KNOT_EOK) {
diff --git a/utils/kr_cache_gc/kr_cache_gc.c b/utils/kr_cache_gc/kr_cache_gc.c
index 27f2a5feb..773c8a6da 100644
--- a/utils/kr_cache_gc/kr_cache_gc.c
+++ b/utils/kr_cache_gc/kr_cache_gc.c
@@ -18,6 +18,9 @@
 #include "categories.h"
 #include "db.h"
 
+#define MAX_OK_PERCENT_USAGE 80.0
+#define TO_BE_FREED_PERCENT 10.0
+
 // section: timer
 // TODO replace/move to contrib
 
@@ -99,6 +102,7 @@ static void entry_dynarray_deep_free(entry_dynarray_t *d)
 
 typedef struct {
 	size_t categories_sizes[CATEGORIES];
+	size_t records;
 } ctx_compute_categories_t;
 
 int cb_compute_categories(const knot_db_val_t *key, gc_record_info_t *info, void *vctx)
@@ -107,6 +111,7 @@ int cb_compute_categories(const knot_db_val_t *key, gc_record_info_t *info, void
 	category_t cat = kr_gc_categorize(info);
 	(void)key;
 	ctx->categories_sizes[cat] += info->entry_size;
+	ctx->records++;
 	return KNOT_EOK;
 }
 
@@ -148,6 +153,11 @@ int kr_cache_gc(kr_cache_gc_cfg_t *cfg)
 		return ret;
 	}
 
+	if (db_usage < MAX_OK_PERCENT_USAGE) {
+		kr_gc_cache_close(&kres_db, db);
+		return KNOT_EOK;
+	}
+
 	gc_timer_t timer_analyze = { 0 }, timer_choose = { 0 }, timer_delete = { 0 }, timer_rw_txn = { 0 };
 
 	gc_timer_start(&timer_analyze);
@@ -158,8 +168,22 @@ int kr_cache_gc(kr_cache_gc_cfg_t *cfg)
 		return ret;
 	}
 
-	category_t limit_category = 50; // TODO fix this computation
-	printf("Cache analyzed in %.2lf secs, limit category is %d.\n", gc_timer_end(&timer_analyze), limit_category);
+	ssize_t amount_tofree = (double)knot_db_lmdb_get_mapsize(db) * TO_BE_FREED_PERCENT / 100.0;
+
+	// debug
+	/*printf("tofree: %zd\n", amount_tofree);
+	for (int i = 0; i < CATEGORIES; i++) {
+		if (cats.categories_sizes[i] > 0) {
+			printf("category %d size %zu\n", i, cats.categories_sizes[i]);
+		}
+	}*/
+
+	category_t limit_category = CATEGORIES;
+	while (limit_category > 0 && amount_tofree > 0) {
+		amount_tofree -= cats.categories_sizes[--limit_category];
+	}
+
+	printf("Cache analyzed in %.2lf secs, %zu records, limit category is %d.\n", gc_timer_end(&timer_analyze), cats.records, limit_category);
 
 	gc_timer_start(&timer_choose);
 	ctx_delete_categories_t to_del = { 0 };