mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-04-28 21:20:48 +00:00
Merge pull request #13350 from opensourcerouting/typesafe-fixes-20230421
lib: typesafe shenanigans
This commit is contained in:
commit
3eefea9249
@ -85,6 +85,15 @@ void typesafe_hash_grow(struct thash_head *head)
|
||||
uint32_t newsize = head->count, i, j;
|
||||
uint8_t newshift, delta;
|
||||
|
||||
/* note hash_grow is called after head->count++, so newsize is
|
||||
* guaranteed to be >= 1. So the minimum argument to builtin_ctz
|
||||
* below is 2, which returns 1, and that makes newshift >= 2.
|
||||
*
|
||||
* Calling hash_grow with a zero head->count would result in a
|
||||
* malformed hash table that has tabshift == 1.
|
||||
*/
|
||||
assert(head->count > 0);
|
||||
|
||||
hash_consistency_check(head);
|
||||
|
||||
newsize |= newsize >> 1;
|
||||
|
@ -783,6 +783,12 @@ struct thash_head {
|
||||
struct thash_item **entries;
|
||||
uint32_t count;
|
||||
|
||||
/* tabshift can be 0 if the hash table is empty and entries is NULL.
|
||||
* otherwise it will always be 2 or larger because it contains
|
||||
* the shift value *plus 1*. This is a trick to make HASH_SIZE return
|
||||
* the correct value (with the >> 1) for tabshift == 0, without needing
|
||||
* a conditional branch.
|
||||
*/
|
||||
uint8_t tabshift;
|
||||
uint8_t minshift, maxshift;
|
||||
};
|
||||
@ -791,8 +797,11 @@ struct thash_head {
|
||||
((1U << (tabshift)) >> 1)
|
||||
#define HASH_SIZE(head) \
|
||||
_HASH_SIZE((head).tabshift)
|
||||
#define _HASH_KEY(tabshift, val) \
|
||||
((val) >> (33 - (tabshift)))
|
||||
#define _HASH_KEY(tabshift, val) \
|
||||
({ \
|
||||
assume((tabshift) >= 2 && (tabshift) <= 33); \
|
||||
(val) >> (33 - (tabshift)); \
|
||||
})
|
||||
#define HASH_KEY(head, val) \
|
||||
_HASH_KEY((head).tabshift, val)
|
||||
#define HASH_GROW_THRESHOLD(head) \
|
||||
@ -939,6 +948,8 @@ macro_pure size_t prefix ## _count(const struct prefix##_head *h) \
|
||||
macro_pure bool prefix ## _member(const struct prefix##_head *h, \
|
||||
const type *item) \
|
||||
{ \
|
||||
if (!h->hh.tabshift) \
|
||||
return NULL; \
|
||||
uint32_t hval = item->field.hi.hashval, hbits = HASH_KEY(h->hh, hval); \
|
||||
const struct thash_item *hitem = h->hh.entries[hbits]; \
|
||||
while (hitem && hitem->hashval < hval) \
|
||||
|
@ -171,6 +171,11 @@ static void concat(test_, TYPE)(void)
|
||||
|
||||
ts_hash("init", "df3f619804a92fdb4057192dc43dd748ea778adc52bc498ce80524c014b81119");
|
||||
|
||||
#if !IS_ATOMIC(REALTYPE)
|
||||
assert(!list_member(&head, &itm[0]));
|
||||
assert(!list_member(&head, &itm[1]));
|
||||
#endif
|
||||
|
||||
#if IS_SORTED(REALTYPE)
|
||||
prng = prng_new(0);
|
||||
k = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user