mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-10-18 09:58:43 +00:00
Code Releases Activity

Hash: dropped relics of hash iterators

Browse Source
This commit is contained in:
Maria Matejka 2024-06-04 12:22:14 +02:00 committed by Katerina Kubecova
parent a04f5c7524
commit fc1ea9119f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hash.h
View File

@ -10,7 +10,7 @@
#ifndef _BIRD_HASH_H_ #ifndef _BIRD_HASH_H_
#define _BIRD_HASH_H_ #define _BIRD_HASH_H_
#define HASH(type) struct { type **data; uint count; u16 iterators; u8 order; u8 down_requested:1; } #define HASH(type) struct { type **data; uint count; u8 order; }
#define HASH_TYPE(v) typeof(** (v).data) #define HASH_TYPE(v) typeof(** (v).data)
#define HASH_SIZE(v) (1U << (v).order) #define HASH_SIZE(v) (1U << (v).order)
@ -130,18 +130,14 @@
#define HASH_MAY_STEP_DOWN_(v,pool,rehash_fn,args) \ #define HASH_MAY_STEP_DOWN_(v,pool,rehash_fn,args) \
({ \ ({ \
if ((v).iterators) \ if (((v).count < (HASH_SIZE(v) REHASH_LO_MARK(args))) && \
(v).down_requested = 1; \ ((v).order > (REHASH_LO_BOUND(args)))) \
else if (((v).count < (HASH_SIZE(v) REHASH_LO_MARK(args))) && \
((v).order > (REHASH_LO_BOUND(args)))) \
rehash_fn(&(v), pool, -(REHASH_LO_STEP(args))); \ rehash_fn(&(v), pool, -(REHASH_LO_STEP(args))); \
}) })
#define HASH_MAY_RESIZE_DOWN_(v,pool,rehash_fn,args) \ #define HASH_MAY_RESIZE_DOWN_(v,pool,rehash_fn,args) \
({ \ ({ \
if ((v).iterators) \ { \
(v).down_requested = 1; \
else { \
uint _o = (v).order; \ uint _o = (v).order; \
while (((v).count < ((1U << _o) REHASH_LO_MARK(args))) && \ while (((v).count < ((1U << _o) REHASH_LO_MARK(args))) && \
(_o > (REHASH_LO_BOUND(args)))) \ (_o > (REHASH_LO_BOUND(args)))) \