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

Tables: Requesting prune only after export cleanup

Browse Source 
We can't free the network structures before the export has been cleaned
up, therefore it makes more sense to request prune only after export
cleanup. This change also reduces prune calls on table shutdown.
This commit is contained in:
Maria Matejka 2022-08-30 18:05:00 +02:00
parent 95d970d7a0
commit 34912b029b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nest/rt-table.c
View File

@ -1748,10 +1748,6 @@ rte_recalculate(struct rt_import_hook *c, net *net, rte *new, struct rte_src *sr
rte_announce(table, net, new_stored, old_stored, rte_announce(table, net, new_stored, old_stored,
net->routes, old_best_stored); net->routes, old_best_stored);
if (!net->routes &&
(table->gc_counter++ >= table->config->gc_threshold))
rt_kick_prune_timer(table);
#if 0 #if 0
/* Enable and reimplement these callbacks if anybody wants to use them */ /* Enable and reimplement these callbacks if anybody wants to use them */
if (old_ok && p->rte_remove) if (old_ok && p->rte_remove)
@ -2852,6 +2848,7 @@ rt_export_cleanup(rtable *tab)
u64 min_seq = ~((u64) 0); u64 min_seq = ~((u64) 0);
struct rt_pending_export *last_export_to_free = NULL; struct rt_pending_export *last_export_to_free = NULL;
struct rt_pending_export *first = tab->exporter.first; struct rt_pending_export *first = tab->exporter.first;
int want_prune = 0;
struct rt_export_hook *eh; struct rt_export_hook *eh;
node *n; node *n;
@ -2928,6 +2925,8 @@ rt_export_cleanup(rtable *tab)
/* First is now the next one */ /* First is now the next one */
net->first = atomic_load_explicit(&first->next, memory_order_relaxed); net->first = atomic_load_explicit(&first->next, memory_order_relaxed);
want_prune += !net->routes && !net->first;
/* For now, the old route may be finally freed */ /* For now, the old route may be finally freed */
if (first->old) if (first->old)
{ {
@ -3003,6 +3002,9 @@ done:;
rt_unlock_table(tab); rt_unlock_table(tab);
} }
if ((tab->gc_counter += want_prune) >= tab->config->gc_threshold)
rt_kick_prune_timer(tab);
if (tab->export_used) if (tab->export_used)
ev_schedule(tab->rt_event); ev_schedule(tab->rt_event);