Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/int-new' into int-new

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2016-05-12 18:11:12 +02:00
commit 776d6b2c05
2 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/hash.h
View file

@ -178,16 +178,36 @@
#define HASH_WALK_FILTER_END } while (0) #define HASH_WALK_FILTER_END } while (0)
static inline uint typedef mem_hash_t u64;
mem_hash(void *p, int s)
{
const char *pp = p;
const u64 multiplier = 0xb38bc09a61202731ULL;
u64 value = 0x001047d54778bcafULL;
int i;
for (i=0;i<s;i++)
value = value*multiplier + pp[i];
static inline void
mem_hash_init(mem_hash_t *h)
{
*h = 0x001047d54778bcafULL;
}
static inline void
mem_hash_mix(mem_hash_t *h, void *p, int s)
{
const u64 multiplier = 0xb38bc09a61202731ULL;
const char *pp = p;
uint i;
for (i=0; i<s; i++)
*h = *h * multiplier + pp[i];
}
static inline uint
mem_hash_value(mem_hash_t *h)
{
return ((value >> 32) ^ (value & 0xffffffff)); return ((value >> 32) ^ (value & 0xffffffff));
} }
static inline uint
mem_hash(void *p, int s)
{
static mem_hash_t h;
mem_hash_init(&h);
mem_hash_mix(&h, p, s);
return mem_hash_value(&h);
}

19
nest/rt-attr.c
View file

@ -946,8 +946,23 @@ rta_alloc_hash(void)
static inline uint static inline uint
rta_hash(rta *a) rta_hash(rta *a)
{ {
return mem_hash(((void *)a) + offsetof(rta, src), sizeof(rta) - offsetof(rta, src)) ^ mem_hash_t h;
mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs); mem_hash_init(&h);
#define MIX(f) mem_hash_mix(&h, &(rta->f), sizeof(rta->f));
MIX(src);
MIX(hostentry);
MIX(iface);
MIX(gw);
MIX(from);
MIX(igp_metric);
MIX(source);
MIX(scope);
MIX(cast);
MIX(dest);
MIX(flags);
MIX(aflags);
return mem_hash_value(&h) ^ mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs);
} }
static inline int static inline int