upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- subnet mem value is available in shm, also when not enabled,

Browse source 
to make the struct easier to memmap by other applications,
  independent of the configuration of unbound.


git-svn-id: file:///svn/unbound/trunk@4112 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-04-12 15:01:11 +00:00
parent 4b39a9eaf8
commit c9e5433a70
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/Changelog
View file

@ -1,3 +1,8 @@
12 April 2017: Wouter
- subnet mem value is available in shm, also when not enabled,
to make the struct easier to memmap by other applications,
independent of the configuration of unbound.
12 April 2017: Ralph 12 April 2017: Ralph
- Fix #1247: unbound does not shorten source prefix length when - Fix #1247: unbound does not shorten source prefix length when
forwarding ECS. forwarding ECS.

5
util/shm_side/shm_main.c
View file

@ -262,8 +262,11 @@ void shm_main_run(struct worker *worker)
fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem)); 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); shm_stat->mem.iter = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack);
} }
#ifdef CLIENT_SUBNET /* subnet mem value is available in shm, also when not enabled,
* to make the struct easier to memmap by other applications,
* independent of the configuration of unbound */
shm_stat->mem.subnet = 0; shm_stat->mem.subnet = 0;
#ifdef CLIENT_SUBNET
modstack = modstack_find(&worker->env.mesh->mods, "subnet"); modstack = modstack_find(&worker->env.mesh->mods, "subnet");
if(modstack != -1) { if(modstack != -1) {
fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem)); fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem));

2
util/shm_side/shm_main.h
View file

@ -61,9 +61,7 @@ struct shm_stat_info {
size_t rrset; size_t rrset;
size_t val; size_t val;
size_t iter; size_t iter;
#ifdef CLIENT_SUBNET
size_t subnet; size_t subnet;
#endif
} mem; } mem;
}; };