From c87aafad759f92ae630fec52079a08ace607410b Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 29 Nov 2017 00:59:31 -0800 Subject: Include allocated table memory in 'sh fib mem' output DBGvpp# sh fib mem FIB memory Tables: SAFI Number Bytes IPv4 unicast 2 673066 IPv6 unicast 2 1054608 MPLS 1 4194312 IPv4 multicast 2 2322 IPv6 multicast 2 ??? Nodes: Name Size in-use /allocated totals Entry 96 20 / 20 1920/1920 Entry Source 32 0 / 0 0/0 Entry Path-Extensions 60 0 / 0 0/0 multicast-Entry 192 12 / 12 2304/2304 Path-list 40 28 / 28 1120/1120 uRPF-list 16 20 / 20 320/320 Path 72 28 / 28 2016/2016 Node-list elements 20 28 / 28 560/560 Node-list heads 8 30 / 30 240/240 Change-Id: I8c8f6f1c87502a40265bf4f302d0daef111a4a4e Signed-off-by: Neale Ranns --- src/vnet/ip/ip4_mtrie.c | 8 +++++--- src/vnet/ip/ip4_mtrie.h | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/vnet/ip') diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c index f114da01b77..5b78cbec1ea 100644 --- a/src/vnet/ip/ip4_mtrie.c +++ b/src/vnet/ip/ip4_mtrie.c @@ -683,8 +683,8 @@ mtrie_ply_memory_usage (ip4_fib_mtrie_t * m, ip4_fib_mtrie_8_ply_t * p) } /* Returns number of bytes of memory used by mtrie. */ -static uword -mtrie_memory_usage (ip4_fib_mtrie_t * m) +uword +ip4_fib_mtrie_memory_usage (ip4_fib_mtrie_t * m) { uword bytes, i; @@ -771,7 +771,9 @@ format_ip4_fib_mtrie (u8 * s, va_list * va) s = format (s, "%d plies, memory usage %U\n", pool_elts (ip4_ply_pool), - format_memory_size, mtrie_memory_usage (m)); + format_memory_size, ip4_fib_mtrie_memory_usage (m)); + s = format (s, "root-ply"); + p = &m->root_ply; if (verbose) { diff --git a/src/vnet/ip/ip4_mtrie.h b/src/vnet/ip/ip4_mtrie.h index be262c2c84d..34b97dc1a9d 100644 --- a/src/vnet/ip/ip4_mtrie.h +++ b/src/vnet/ip/ip4_mtrie.h @@ -161,6 +161,11 @@ void ip4_fib_mtrie_route_del (ip4_fib_mtrie_t * m, u32 adj_index, u32 cover_address_length, u32 cover_adj_index); +/** + * @brief return the memory used by the table + */ +uword ip4_fib_mtrie_memory_usage (ip4_fib_mtrie_t * m); + /** * @brief Format/display the contents of the mtrie */ -- cgit 1.2.3-korg