From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Tue, 11 Apr 2017 13:37:39 +0000 (+0000)
Subject: - Also display ECS module memory stats in stats_shm
X-Git-Tag: release-1.6.2rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8bfa02af1bf901d8a2e23474a6276f505b4c70b;p=thirdparty%2Funbound.git

- Also display ECS module memory stats in stats_shm


git-svn-id: file:///svn/unbound/trunk@4107 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 3f00525b6..6cd4e7086 100644
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -238,6 +238,9 @@ static void print_mem(struct shm_stat_info* shm_stat)
 	PR_LL("mem.cache.message", shm_stat->mem.msg);
 	PR_LL("mem.cache.iterator", shm_stat->mem.iter);
 	PR_LL("mem.cache.validator", shm_stat->mem.val);
+#ifdef CLIENT_SUBNET
+	PR_LL("mem.cache.subnet", shm_stat->mem.subnet);
+#endif
 }
 
 /** print histogram */
diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c
index 1753b15e2..32ba73f1e 100644
--- a/util/shm_side/shm_main.c
+++ b/util/shm_side/shm_main.c
@@ -262,6 +262,13 @@ void shm_main_run(struct worker *worker)
 			fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem));
 			shm_stat->mem.iter = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack);
 		}
+#ifdef CLIENT_SUBNET
+		modstack = modstack_find(&worker->env.mesh->mods, "subnet");
+		if(modstack != -1) {
+			fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem));
+			shm_stat->mem.subnet = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack);
+		}
+#endif
 	}
 
 	server_stats_add(stat_total, stat_info);
diff --git a/util/shm_side/shm_main.h b/util/shm_side/shm_main.h
index c45519306..1ecac5560 100644
--- a/util/shm_side/shm_main.h
+++ b/util/shm_side/shm_main.h
@@ -61,6 +61,9 @@ struct shm_stat_info {
 		size_t rrset;
 		size_t val;
 		size_t iter;
+#ifdef CLIENT_SUBNET
+		size_t subnet;
+#endif
 	} mem;
 };