mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-23 14:57:02 +00:00
Code Releases Activity

Nest: Add hash table for interfaces, keyed by index

Browse Source 
Useful if one have too many interfaces, as there are per-route
iface index lookups in routing table scan.
This commit is contained in:
Ondrej Zajicek (work) 2019-05-14 19:01:44 +02:00
parent e092341df3
commit 5c73cd94a5
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nest/iface.c
View File

@ -29,6 +29,7 @@
#include "nest/iface.h" #include "nest/iface.h"
#include "nest/protocol.h" #include "nest/protocol.h"
#include "nest/cli.h" #include "nest/cli.h"
#include "lib/hash.h"
#include "lib/resource.h" #include "lib/resource.h"
#include "lib/string.h" #include "lib/string.h"
#include "conf/conf.h" #include "conf/conf.h"
@ -38,6 +39,20 @@ static pool *if_pool;
list iface_list; list iface_list;
#define IFH_KEY(n) n->index
#define IFH_NEXT(n) n->next
#define IFH_EQ(a,b) a == b
#define IFH_FN(k) u32_hash(k)
#define IFH_ORDER 6
#define IFH_REHASH if_rehash
#define IFH_PARAMS /8, *1, 2, 2, 6, 20
HASH_DEFINE_REHASH_FN(IFH, struct iface)
static HASH(struct iface) iface_hash;
static void if_recalc_preferred(struct iface *i); static void if_recalc_preferred(struct iface *i);
/** /**
@ -311,6 +326,7 @@ if_update(struct iface *new)
DBG("Interface %s changed too much -- forcing down/up transition\n", i->name); DBG("Interface %s changed too much -- forcing down/up transition\n", i->name);
if_change_flags(i, i->flags | IF_TMP_DOWN); if_change_flags(i, i->flags | IF_TMP_DOWN);
rem_node(&i->n); rem_node(&i->n);
HASH_REMOVE2(iface_hash, IFH, if_pool, i);
new->addr4 = i->addr4; new->addr4 = i->addr4;
new->addr6 = i->addr6; new->addr6 = i->addr6;
new->llv6 = i->llv6; new->llv6 = i->llv6;
@ -335,6 +351,7 @@ newif:
init_list(&i->neighbors); init_list(&i->neighbors);
i->flags |= IF_UPDATED | IF_TMP_DOWN; /* Tmp down as we don't have addresses yet */ i->flags |= IF_UPDATED | IF_TMP_DOWN; /* Tmp down as we don't have addresses yet */
add_tail(&iface_list, &i->n); add_tail(&iface_list, &i->n);
HASH_INSERT2(iface_hash, IFH, if_pool, i);
return i; return i;
} }
@ -427,12 +444,8 @@ if_feed_baby(struct proto *p)
struct iface * struct iface *
if_find_by_index(unsigned idx) if_find_by_index(unsigned idx)
{ {
struct iface *i; struct iface *i = HASH_FIND(iface_hash, IFH, idx);
return (i && !(i->flags & IF_SHUTDOWN)) ? i : NULL;
WALK_LIST(i, iface_list)
if (i->index == idx && !(i->flags & IF_SHUTDOWN))
return i;
return NULL;
} }
/** /**
@ -469,6 +482,7 @@ if_get_by_name(char *name)
init_list(&i->addrs); init_list(&i->addrs);
init_list(&i->neighbors); init_list(&i->neighbors);
add_tail(&iface_list, &i->n); add_tail(&iface_list, &i->n);
/* No need to insert dummy nodes to iface_hash */
return i; return i;
} }
@ -635,6 +649,7 @@ ifa_delete(struct ifa *a)
if (ifa_same(b, a)) if (ifa_same(b, a))
{ {
rem_node(&b->n); rem_node(&b->n);
HASH_REMOVE2(iface_hash, IFH, if_pool, i);
if (b->flags & IA_PRIMARY) if (b->flags & IA_PRIMARY)
{ {
@ -712,7 +727,10 @@ void
if_init(void) if_init(void)
{ {
if_pool = rp_new(&root_pool, "Interfaces"); if_pool = rp_new(&root_pool, "Interfaces");
init_list(&iface_list); init_list(&iface_list);
HASH_INIT(iface_hash, if_pool, IFH_ORDER);
neigh_init(if_pool); neigh_init(if_pool);
} }

1
nest/iface.h
View File

@ -35,6 +35,7 @@ struct iface {
unsigned mtu; unsigned mtu;
unsigned index; /* OS-dependent interface index */ unsigned index; /* OS-dependent interface index */
unsigned master_index; /* Interface index of master iface */ unsigned master_index; /* Interface index of master iface */
struct iface *next; /* Next in iface_hash */
struct iface *master; /* Master iface (e.g. for VRF) */ struct iface *master; /* Master iface (e.g. for VRF) */
list addrs; /* Addresses assigned to this interface */ list addrs; /* Addresses assigned to this interface */
struct ifa *addr4; /* Primary address for IPv4 */ struct ifa *addr4; /* Primary address for IPv4 */