mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-18 17:18:42 +00:00
Code Releases Activity

Next hop update triggered at the very end of hostcache update

Browse Source
This commit is contained in:
Maria Matejka 2022-09-05 12:55:36 +02:00
parent 636bc44e61
commit 28accd4f05
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nest/rt-table.c
View File

@ -103,6 +103,7 @@
#include "lib/string.h" #include "lib/string.h"
#include "lib/alloca.h" #include "lib/alloca.h"
#include "lib/flowspec.h" #include "lib/flowspec.h"
#include "lib/idm.h"
#ifdef CONFIG_BGP #ifdef CONFIG_BGP
#include "proto/bgp/bgp.h" #include "proto/bgp/bgp.h"
@ -2420,7 +2421,7 @@ rt_flowspec_export_one(struct rt_export_request *req, const net_addr *net, struc
rtable *dst = ln->dst; rtable *dst = ln->dst;
ASSUME(rt_is_flow(dst)); ASSUME(rt_is_flow(dst));
/* No need to inspect it further if recalculation is already active */ /* No need to inspect it further if recalculation is already scheduled */
if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY) if ((dst->nhu_state == NHU_SCHEDULED) || (dst->nhu_state == NHU_DIRTY)
|| !trie_match_net(dst->flowspec_trie, net)) || !trie_match_net(dst->flowspec_trie, net))
{ {
@ -2583,6 +2584,9 @@ rt_exporter_init(struct rt_exporter *e)
init_list(&e->hooks); init_list(&e->hooks);
} }
static struct idm rtable_idm;
uint rtable_max_id = 0;
rtable * rtable *
rt_setup(pool *pp, struct rtable_config *cf) rt_setup(pool *pp, struct rtable_config *cf)
{ {
@ -2596,6 +2600,9 @@ rt_setup(pool *pp, struct rtable_config *cf)
t->name = cf->name; t->name = cf->name;
t->config = cf; t->config = cf;
t->addr_type = cf->addr_type; t->addr_type = cf->addr_type;
t->id = idm_alloc(&rtable_idm);
if (t->id >= rtable_max_id)
rtable_max_id = t->id + 1;
fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL); fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
@ -2659,6 +2666,7 @@ rt_init(void)
init_list(&deleted_routing_tables); init_list(&deleted_routing_tables);
ev_init_list(&rt_cork.queue, &main_birdloop, "Route cork release"); ev_init_list(&rt_cork.queue, &main_birdloop, "Route cork release");
rt_cork.run = (event) { .hook = rt_cork_release_hook }; rt_cork.run = (event) { .hook = rt_cork_release_hook };
idm_init(&rtable_idm, rt_table_pool, 256);
} }
@ -4247,6 +4255,9 @@ rt_update_hostcache(void *data)
return; return;
} }
/* Destination schedule map */
rtable **nhu_pending = tmp_allocz(sizeof(rtable *) * rtable_max_id);
struct hostentry *he; struct hostentry *he;
node *n, *x; node *n, *x;
@ -4264,8 +4275,12 @@ rt_update_hostcache(void *data)
} }
if (rt_update_hostentry(tab, he)) if (rt_update_hostentry(tab, he))
rt_schedule_nhu(he->tab); nhu_pending[he->tab->id] = he->tab;
} }
for (uint i=0; i<rtable_max_id; i++)
if (nhu_pending[i])
rt_schedule_nhu(nhu_pending[i]);
} }
static struct hostentry * static struct hostentry *

3
nest/rt.h
View File

@ -91,6 +91,8 @@ struct rt_table_exporter {
u64 next_seq; /* The next export will have this ID */ u64 next_seq; /* The next export will have this ID */
}; };
extern uint rtable_max_id;
typedef struct rtable { typedef struct rtable {
resource r; resource r;
node n; /* Node in list of all tables */ node n; /* Node in list of all tables */
@ -100,6 +102,7 @@ typedef struct rtable {
struct f_trie *trie; /* Trie of prefixes defined in fib */ struct f_trie *trie; /* Trie of prefixes defined in fib */
char *name; /* Name of this table */ char *name; /* Name of this table */
uint addr_type; /* Type of address data stored in table (NET_*) */ uint addr_type; /* Type of address data stored in table (NET_*) */
uint id; /* Integer table ID for fast lookup */
int use_count; /* Number of protocols using this table */ int use_count; /* Number of protocols using this table */
u32 rt_count; /* Number of routes in the table */ u32 rt_count; /* Number of routes in the table */