diff options
| author |   Dave Barach <dave@barachs.net> | 2020-02-11 15:06:34 -0500 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2020-02-11 23:57:18 +0000 |
| commit | 2c8e0023f91882e53f06eb99c901b97fe013f981 (patch) | |
| tree | a0026aa039284780b7ec5da6f913e9cab5edd489 /src/vnet/fib/ip4_fib.c | |
| parent | a6ef36b2c25de47824a1b45e147ab2fbf67c3a33 (diff) | |
vppinfra: remove the historical mheap memory allocator
The mheap allocator has been turned off for several releases. This
commit removes the cmake config parameter, parallel support for
dlmalloc and mheap, and the mheap allocator itself.
Type: refactor
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I104f88a1f06e47e90e5f7fb3e11cd1ca66467903
Diffstat (limited to 'src/vnet/fib/ip4_fib.c')
| -rw-r--r-- | src/vnet/fib/ip4_fib.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c index d4ef698bc9a..29d121c96a7 100644 --- a/src/vnet/fib/ip4_fib.c +++ b/src/vnet/fib/ip4_fib.c @@ -129,7 +129,7 @@ ip4_create_fib_with_table_id (u32 table_id, v4_fib->table_id = table_id; fib_table->ft_flow_hash_config = IP_FLOW_HASH_DEFAULT; - + fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP4, src); ip4_mtrie_init(&v4_fib->mtrie); @@ -369,7 +369,7 @@ ip4_fib_table_entry_remove (ip4_fib_t *fib, * removing a non-existent entry. i'll allow it. */ } - else + else { uword *old_heap; @@ -559,7 +559,7 @@ ip4_fib_table_show_one (ip4_fib_t *fib, ip4_address_t *address, u32 mask_len, int detail) -{ +{ vlib_cli_output(vm, "%U", format_fib_entry, ip4_fib_table_lookup(fib, address, mask_len), @@ -571,19 +571,10 @@ ip4_fib_table_show_one (ip4_fib_t *fib, u8 * format_ip4_fib_table_memory (u8 * s, va_list * args) { -#if USE_DLMALLOC == 0 - s = format(s, "%=30s %=6d %=12ld\n", - "IPv4 unicast", - pool_elts(ip4_main.fibs), - mheap_bytes(ip4_main.mtrie_mheap)); -#else s = format(s, "%=30s %=6d %=12ld\n", "IPv4 unicast", pool_elts(ip4_main.fibs), mspace_footprint(ip4_main.mtrie_mheap)); -#endif - - return (s); } |