From: Libor Peltan <libor.peltan@nic.cz>
Date: Thu, 16 Apr 2020 09:14:32 +0000 (+0200)
Subject: kjournalprint: -z -d lists zones with sizes
X-Git-Tag: embedded_lmdb~35^2~101^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f654081416b68204916bc86287c9412aa14dd69;p=thirdparty%2Fknot-dns.git

kjournalprint: -z -d lists zones with sizes
---

diff --git a/src/utils/kjournalprint/main.c b/src/utils/kjournalprint/main.c
index 44ec2dcf64..63945d094e 100644
--- a/src/utils/kjournalprint/main.c
+++ b/src/utils/kjournalprint/main.c
@@ -215,24 +215,63 @@ int print_journal(char *path, knot_dname_t *name, print_params_t *params)
 	return ret;
 }
 
-static int list_zone(const knot_dname_t *zone, void *ctx)
+static int add_zone_to_list(const knot_dname_t *zone, void *list)
+{
+	knot_dname_t *copy = knot_dname_copy(zone, NULL);
+	if (copy == NULL) {
+		return KNOT_ENOMEM;
+	}
+	return ptrlist_add(list, copy, NULL) == NULL ? KNOT_ENOMEM : KNOT_EOK;
+}
+
+static int list_zone(const knot_dname_t *zone, bool detailed, knot_lmdb_db_t *jdb, uint64_t *occupied_all)
 {
-	(void)ctx;
 	knot_dname_txt_storage_t zone_str;
 	if (knot_dname_to_str(zone_str, zone, sizeof(zone_str)) == NULL) {
 		return KNOT_EINVAL;
 	}
-	printf("%s\n", zone_str);
+
+	if (detailed) {
+		zone_journal_t j = { jdb, zone };
+		bool exists;
+		uint64_t occupied;
+
+		int ret = journal_info(j, &exists, NULL, NULL, NULL, NULL, NULL, &occupied, occupied_all);
+		if (ret != KNOT_EOK) {
+			return ret;
+		}
+		assert(exists);
+		printf("%s \t%"PRIu64" KiB\n", zone_str, occupied / 1024);
+	} else {
+		printf("%s\n", zone_str);
+	}
 	return KNOT_EOK;
 }
 
-int list_zones(char *path)
+int list_zones(char *path, bool detailed)
 {
 	knot_lmdb_db_t jdb = { 0 };
 	knot_lmdb_init(&jdb, path, 0, journal_env_flags(JOURNAL_MODE_ROBUST), NULL);
 
-	int ret = journals_walk(&jdb, list_zone, NULL);
+	list_t zones;
+	init_list(&zones);
+	ptrnode_t *zone;
+	uint64_t occupied_all = 0;
+
+	int ret = journals_walk(&jdb, add_zone_to_list, &zones);
+	WALK_LIST(zone, zones) {
+		if (ret != KNOT_EOK) {
+			break;
+		}
+		ret = list_zone(zone->d, detailed, &jdb, &occupied_all);
+	}
+
 	knot_lmdb_deinit(&jdb);
+	ptrlist_deep_free(&zones, NULL);
+
+	if (detailed && ret == KNOT_EOK) {
+		printf("Occupied all zones together: %"PRIu64" KiB\n", occupied_all / 1024);
+	}
 	return ret;
 }
 
@@ -313,7 +352,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (justlist) {
-		int ret = list_zones(db);
+		int ret = list_zones(db, params.debug);
 		switch (ret) {
 		case KNOT_ENOENT:
 			printf("No zones in journal DB\n");