diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-05-28 11:09:40 +0000 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-05-30 11:52:00 +0000 |
| commit | 05cac30a9228ddc543b3327cb8a494d79eb5b90d (patch) | |
| tree | 506bb9193a551f05a1f2d96d7104bbc778d50514 /src/vnet/mfib | |
| parent | 6439fea6639b0579ed3b0c8ebbb6929ef157c522 (diff) | |
FIB: correctly report IPv6 FIB Unicast and Multicast memory usage (VPP-1578)"
and document scaling
Change-Id: I65d8999e65616d77e525963c770d91e9b0d5e593
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/mfib')
| -rw-r--r-- | src/vnet/mfib/ip4_mfib.c | 2 | ||||
| -rw-r--r-- | src/vnet/mfib/ip6_mfib.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/vnet/mfib/ip4_mfib.c b/src/vnet/mfib/ip4_mfib.c index 87603715d83..1d872f974fd 100644 --- a/src/vnet/mfib/ip4_mfib.c +++ b/src/vnet/mfib/ip4_mfib.c @@ -366,7 +366,7 @@ format_ip4_mfib_table_memory (u8 * s, va_list * args) total_memory += mfib_size; })); - s = format(s, "%=30s %=6d %=8ld\n", + s = format(s, "%=30s %=6d %=12ld\n", "IPv4 multicast", pool_elts(ip4_main.mfibs), total_memory); diff --git a/src/vnet/mfib/ip6_mfib.c b/src/vnet/mfib/ip6_mfib.c index aa9fdb9a98b..31a92687e1a 100644 --- a/src/vnet/mfib/ip6_mfib.c +++ b/src/vnet/mfib/ip6_mfib.c @@ -521,9 +521,14 @@ VLIB_INIT_FUNCTION(ip6_mfib_module_init); u8 * format_ip6_mfib_table_memory (u8 * s, va_list * args) { - s = format(s, "%=30s %=6d %=8s\n", + u64 bytes_inuse; + + bytes_inuse = alloc_arena_next(&(ip6_main.ip6_mtable.ip6_mhash)); + + s = format(s, "%=30s %=6d %=12ld\n", "IPv6 multicast", - pool_elts(ip6_main.mfibs), "???"); + pool_elts(ip6_main.mfibs), + bytes_inuse); return (s); } |