From 3542e49cf539ecfcef6ef7c2d4befb7896ade2cd Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 1 Apr 2021 22:18:29 +0200 Subject: cache: rename chain_htable to cache_chain_ht Rename the hashtable chain that is used for fast cache lookups. Signed-off-by: Pablo Neira Ayuso --- src/cache.c | 6 +++--- src/rule.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/cache.c b/src/cache.c index 63971e86..40012890 100644 --- a/src/cache.c +++ b/src/cache.c @@ -195,7 +195,7 @@ static int chain_cache_cb(struct nftnl_chain *nlc, void *arg) if (chain->flags & CHAIN_F_BINDING) { list_add_tail(&chain->list, &ctx->table->chain_bindings); } else { - list_add_tail(&chain->hlist, &ctx->table->chain_htable[hash]); + list_add_tail(&chain->cache_hlist, &ctx->table->cache_chain_ht[hash]); list_add_tail(&chain->list, &ctx->table->chains); } @@ -239,7 +239,7 @@ void chain_cache_add(struct chain *chain, struct table *table) uint32_t hash; hash = djb_hash(chain->handle.chain.name) % NFT_CACHE_HSIZE; - list_add_tail(&chain->hlist, &table->chain_htable[hash]); + list_add_tail(&chain->cache_hlist, &table->cache_chain_ht[hash]); list_add_tail(&chain->list, &table->chains); } @@ -250,7 +250,7 @@ struct chain *chain_cache_find(const struct table *table, uint32_t hash; hash = djb_hash(handle->chain.name) % NFT_CACHE_HSIZE; - list_for_each_entry(chain, &table->chain_htable[hash], hlist) { + list_for_each_entry(chain, &table->cache_chain_ht[hash], cache_hlist) { if (!strcmp(chain->handle.chain.name, handle->chain.name)) return chain; } diff --git a/src/rule.c b/src/rule.c index 96931800..79706ab7 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1140,10 +1140,10 @@ struct table *table_alloc(void) init_list_head(&table->scope.symbols); table->refcnt = 1; - table->chain_htable = + table->cache_chain_ht = xmalloc(sizeof(struct list_head) * NFT_CACHE_HSIZE); for (i = 0; i < NFT_CACHE_HSIZE; i++) - init_list_head(&table->chain_htable[i]); + init_list_head(&table->cache_chain_ht[i]); return table; } @@ -1171,7 +1171,7 @@ void table_free(struct table *table) obj_free(obj); handle_free(&table->handle); scope_release(&table->scope); - xfree(table->chain_htable); + xfree(table->cache_chain_ht); xfree(table); } -- cgit v1.2.3