From 1f50bf8fc57ebf78f9056185a342493be460a847 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 16 Jul 2019 15:28:52 +0000 Subject: fib: FIB Entry tracking Instead of all clients directly RR sourcing the entry they are tracking, use a deidcated 'tracker' object. This tracker object is a entry delegate and a child of the entry. The clients are then children of the tracker. The benefit of this aproach is that each time a new client tracks the entry it doesn't RR source it. When an entry is sourced all its children are updated. Thus, new clients tracking an entry is O(n^2). With the tracker as indirection, the entry is sourced only once. Type: feature Change-Id: I5b80bdda6c02057152e5f721e580e786cd840a3b Signed-off-by: Neale Ranns --- src/vnet/ipip/sixrd.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/vnet/ipip/sixrd.c') diff --git a/src/vnet/ipip/sixrd.c b/src/vnet/ipip/sixrd.c index 30c37c80fe8..d4adf9dc434 100644 --- a/src/vnet/ipip/sixrd.c +++ b/src/vnet/ipip/sixrd.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -227,12 +228,10 @@ sixrd_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) fib_node_init (&sixrd_ad->sixrd_node, sixrd_fib_node_type); sixrd_ad->adj_index = ai; sixrd_ad->sixrd_fib_entry_index = - fib_table_entry_special_add (t->fib_index, &pfx, FIB_SOURCE_RR, - FIB_ENTRY_FLAG_NONE); - sixrd_ad->sixrd_sibling = - fib_entry_child_add (sixrd_ad->sixrd_fib_entry_index, - sixrd_fib_node_type, - sixrd_ad - sixrd_adj_delegate_pool); + fib_entry_track (t->fib_index, &pfx, + sixrd_fib_node_type, + sixrd_ad - sixrd_adj_delegate_pool, + &sixrd_ad->sixrd_sibling); adj_delegate_add (adj, sixrd_adj_delegate_type, sixrd_ad - sixrd_adj_delegate_pool); @@ -421,10 +420,8 @@ sixrd_adj_delegate_adj_deleted (adj_delegate_t * aed) sixrd_adj_delegate_t *sixrd_ad; sixrd_ad = sixrd_adj_from_base (aed); - fib_entry_child_remove (sixrd_ad->sixrd_fib_entry_index, - sixrd_ad->sixrd_sibling); - fib_table_entry_delete_index (sixrd_ad->sixrd_fib_entry_index, - FIB_SOURCE_RR); + fib_entry_untrack (sixrd_ad->sixrd_fib_entry_index, + sixrd_ad->sixrd_sibling); pool_put (sixrd_adj_delegate_pool, sixrd_ad); } -- cgit 1.2.3-korg