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

nicer code, in function.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4790 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-07-17 15:07:09 +00:00
parent 5bda4f9822
commit f8e585f308
6 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/daemon.c
View file

@ -803,9 +803,8 @@ void daemon_apply_cfg(struct daemon* daemon, struct config_file* cfg)
{ {
daemon->cfg = cfg; daemon->cfg = cfg;
config_apply(cfg); config_apply(cfg);
if(!daemon->env->msg_cache || if(!slabhash_is_size(daemon->env->msg_cache, cfg->msg_cache_size,
cfg->msg_cache_slabs != daemon->env->msg_cache->size || cfg->msg_cache_slabs)) {
(cfg->msg_cache_size/cfg->msg_cache_slabs)*cfg->msg_cache_slabs != slabhash_get_size(daemon->env->msg_cache)) {
slabhash_delete(daemon->env->msg_cache); slabhash_delete(daemon->env->msg_cache);
daemon->env->msg_cache = slabhash_create(cfg->msg_cache_slabs, daemon->env->msg_cache = slabhash_create(cfg->msg_cache_slabs,
HASH_DEFAULT_STARTARRAY, cfg->msg_cache_size, HASH_DEFAULT_STARTARRAY, cfg->msg_cache_size,

5
libunbound/context.c
View file

@ -71,9 +71,8 @@ context_finalize(struct ub_ctx* ctx)
return UB_INITFAIL; return UB_INITFAIL;
if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1)) if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1))
return UB_INITFAIL; return UB_INITFAIL;
if(!ctx->env->msg_cache || if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size,
cfg->msg_cache_slabs != ctx->env->msg_cache->size || cfg->msg_cache_slabs)) {
(cfg->msg_cache_size/cfg->msg_cache_slabs)*cfg->msg_cache_slabs != slabhash_get_size(ctx->env->msg_cache)) {
slabhash_delete(ctx->env->msg_cache); slabhash_delete(ctx->env->msg_cache);
ctx->env->msg_cache = slabhash_create(cfg->msg_cache_slabs, ctx->env->msg_cache = slabhash_create(cfg->msg_cache_slabs,
HASH_DEFAULT_STARTARRAY, cfg->msg_cache_size, HASH_DEFAULT_STARTARRAY, cfg->msg_cache_size,

11
services/cache/infra.c vendored
View file

@ -302,12 +302,11 @@ infra_adjust(struct infra_cache* infra, struct config_file* cfg)
/* divide cachesize by slabs and multiply by slabs, because if the /* divide cachesize by slabs and multiply by slabs, because if the
* cachesize is not an even multiple of slabs, that is the resulting * cachesize is not an even multiple of slabs, that is the resulting
* size of the slabhash */ * size of the slabhash */
if((maxmem/cfg->infra_cache_slabs)*cfg->infra_cache_slabs != slabhash_get_size(infra->hosts) || if(!slabhash_is_size(infra->hosts, maxmem, cfg->infra_cache_slabs) ||
cfg->infra_cache_slabs != infra->hosts->size || !slabhash_is_size(infra->domain_rates, cfg->ratelimit_size,
cfg->ratelimit_slabs != infra->domain_rates->size || cfg->ratelimit_slabs) ||
(cfg->ratelimit_size/cfg->ratelimit_slabs)*cfg->ratelimit_slabs != slabhash_get_size(infra->domain_rates) || !slabhash_is_size(infra->client_ip_rates, cfg->ip_ratelimit_size,
cfg->ip_ratelimit_slabs != infra->client_ip_rates->size || cfg->ip_ratelimit_slabs)) {
(cfg->ip_ratelimit_size/cfg->ip_ratelimit_slabs)*cfg->ip_ratelimit_slabs != slabhash_get_size(infra->client_ip_rates)) {
infra_delete(infra); infra_delete(infra);
infra = infra_create(cfg); infra = infra_create(cfg);
} else { } else {

4
services/cache/rrset.c vendored
View file

@ -81,8 +81,8 @@ void rrset_cache_delete(struct rrset_cache* r)
struct rrset_cache* rrset_cache_adjust(struct rrset_cache *r, struct rrset_cache* rrset_cache_adjust(struct rrset_cache *r,
struct config_file* cfg, struct alloc_cache* alloc) struct config_file* cfg, struct alloc_cache* alloc)
{ {
if(!r || !cfg || cfg->rrset_cache_slabs != r->table.size || if(!r || !cfg || !slabhash_is_size(&r->table, cfg->rrset_cache_size,
cfg->rrset_cache_size != slabhash_get_size(&r->table)) cfg->rrset_cache_slabs))
{ {
rrset_cache_delete(r); rrset_cache_delete(r);
r = rrset_cache_create(cfg, alloc); r = rrset_cache_create(cfg, alloc);

13
util/storage/slabhash.c
View file

@ -153,6 +153,19 @@ size_t slabhash_get_size(struct slabhash* sl)
return total; return total;
} }
int slabhash_is_size(struct slabhash* sl, size_t size, size_t slabs)
{
/* divide by slabs and then multiply by the number of slabs,
* because if the size is not an even multiple of slabs, the
* uneven amount needs to be removed for comparison */
if(!sl) return 0;
if(sl->size != slabs) return 0;
if(slabs == 0) return 0;
if( (size/slabs)*slabs == slabhash_get_size(sl))
return 1;
return 0;
}
size_t slabhash_get_mem(struct slabhash* sl) size_t slabhash_get_mem(struct slabhash* sl)
{ {
size_t i, total = sizeof(*sl); size_t i, total = sizeof(*sl);

9
util/storage/slabhash.h
View file

@ -152,6 +152,15 @@ void slabhash_status(struct slabhash* table, const char* id, int extended);
*/ */
size_t slabhash_get_size(struct slabhash* table); size_t slabhash_get_size(struct slabhash* table);
/**
* See if slabhash is of given (size, slabs) configuration.
* @param table: hash table
* @param size: max size to test for
* @param slabs: slab count to test for.
* @return true if equal
*/
int slabhash_is_size(struct slabhash* table, size_t size, size_t slabs);
/** /**
* Retrieve slab hash current memory use. * Retrieve slab hash current memory use.
* @param table: hash table. * @param table: hash table.