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/fib/fib_entry_delegate.h | 44 ++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 17 deletions(-) (limited to 'src/vnet/fib/fib_entry_delegate.h') diff --git a/src/vnet/fib/fib_entry_delegate.h b/src/vnet/fib/fib_entry_delegate.h index 333d357c120..8fb805a56a8 100644 --- a/src/vnet/fib/fib_entry_delegate.h +++ b/src/vnet/fib/fib_entry_delegate.h @@ -17,6 +17,7 @@ #define __FIB_ENTRY_DELEGATE_T__ #include +#include /** * Delegate types @@ -46,6 +47,10 @@ typedef enum fib_entry_delegate_type_t_ { * BFD session state */ FIB_ENTRY_DELEGATE_BFD, + /** + * Tracker + */ + FIB_ENTRY_DELEGATE_TRACK, /** * Attached import/export functionality */ @@ -59,19 +64,7 @@ typedef enum fib_entry_delegate_type_t_ { _fdt <= FIB_ENTRY_DELEGATE_CHAIN_NSH; \ _fdt++) \ { \ - _fed = fib_entry_delegate_get(_entry, _fdt); \ - if (NULL != _fed) { \ - _body; \ - } \ - } \ -} -#define FOR_EACH_DELEGATE(_entry, _fdt, _fed, _body) \ -{ \ - for (_fdt = FIB_ENTRY_DELEGATE_CHAIN_UNICAST_IP4; \ - _fdt <= FIB_ENTRY_DELEGATE_ATTACHED_EXPORT; \ - _fdt++) \ - { \ - _fed = fib_entry_delegate_get(_entry, _fdt); \ + _fed = fib_entry_delegate_find(_entry, _fdt); \ if (NULL != _fed) { \ _body; \ } \ @@ -88,6 +81,15 @@ typedef enum fib_bfd_state_t_ FIB_BFD_STATE_DOWN, } fib_bfd_state_t; +/** + * State for FIB entry tracking + */ +typedef struct fib_entry_delegate_track_t_ +{ + fib_node_t fedt_node; + u32 fedt_sibling; +} fib_entry_delegate_track_t; + /** * A Delagate is a means to implmenet the Delagation design pattern; the extension of an * objects functionality through the composition of, and delgation to, other objects. @@ -134,17 +136,22 @@ typedef struct fib_entry_delegate_t_ * BFD state */ fib_bfd_state_t fd_bfd_state; + + /** + * tracker state + */ + fib_entry_delegate_track_t fd_track; }; } fib_entry_delegate_t; struct fib_entry_t_; -extern void fib_entry_delegate_remove(struct fib_entry_t_ *fib_entry, +extern void fib_entry_delegate_remove(fib_entry_t *fib_entry, fib_entry_delegate_type_t type); -extern fib_entry_delegate_t *fib_entry_delegate_find_or_add(struct fib_entry_t_ *fib_entry, +extern fib_entry_delegate_t *fib_entry_delegate_find_or_add(fib_entry_t *fib_entry, fib_entry_delegate_type_t fdt); -extern fib_entry_delegate_t *fib_entry_delegate_get(const struct fib_entry_t_ *fib_entry, +extern fib_entry_delegate_t *fib_entry_delegate_find(const fib_entry_t *fib_entry, fib_entry_delegate_type_t type); extern fib_forward_chain_type_t fib_entry_delegate_type_to_chain_type( @@ -153,6 +160,9 @@ extern fib_forward_chain_type_t fib_entry_delegate_type_to_chain_type( extern fib_entry_delegate_type_t fib_entry_chain_type_to_delegate_type( fib_forward_chain_type_t type); -extern u8 *format_fib_entry_deletegate(u8 * s, va_list * args); +extern u8 *format_fib_entry_delegate(u8 * s, va_list * args); + +extern fib_node_index_t fib_entry_delegate_get_index (const fib_entry_delegate_t *fed); +extern fib_entry_delegate_t * fib_entry_delegate_get (fib_node_index_t fedi); #endif -- cgit 1.2.3-korg