diff options
| author |   Dave Barach <dave@barachs.net> | 2018-07-04 10:56:23 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-07-18 12:09:42 +0000 |
| commit | 6a5adc369591fcac2447e9809deaa22f56b53911 (patch) | |
| tree | c9a56b1ed0d5e8eb2f21a843552c6c0bc6df5597 /src/vnet | |
| parent | 2a3fb1a28b170ac1d37815983611e83d148811d4 (diff) | |
Add config option to use dlmalloc instead of mheap
Configure w/ --enable-dlmalloc, see .../build-data/platforms/vpp.mk
src/vppinfra/dlmalloc.[ch] are slightly modified versions of the
well-known Doug Lea malloc. Main advantage: dlmalloc mspaces have no
inherent size limit.
Change-Id: I19b3f43f3c65bcfb82c1a265a97922d01912446e
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/classify/vnet_classify.c | 8 | ||||
| -rw-r--r-- | src/vnet/fib/ip4_fib.c | 8 | ||||
| -rw-r--r-- | src/vnet/ip/ip4_mtrie.c | 4 |
3 files changed, 20 insertions, 0 deletions
diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c index d287a2d39cf..9d8694a4993 100644 --- a/src/vnet/classify/vnet_classify.c +++ b/src/vnet/classify/vnet_classify.c @@ -140,7 +140,11 @@ vnet_classify_new_table (vnet_classify_main_t * cm, t->skip_n_vectors = skip_n_vectors; t->entries_per_page = 2; +#if USE_DLMALLOC == 0 t->mheap = mheap_alloc (0 /* use VM */ , memory_size); +#else + t->mheap = create_mspace (memory_size, 1 /* locked */ ); +#endif vec_validate_aligned (t->buckets, nbuckets - 1, CLIB_CACHE_LINE_BYTES); oldheap = clib_mem_set_heap (t->mheap); @@ -170,7 +174,11 @@ vnet_classify_delete_table_index (vnet_classify_main_t * cm, vec_free (t->mask); vec_free (t->buckets); +#if USE_DLMALLOC == 0 mheap_free (t->mheap); +#else + destroy_mspace (t->mheap); +#endif pool_put (cm->tables, t); } diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c index a3cb682713d..01f4a755ec2 100644 --- a/src/vnet/fib/ip4_fib.c +++ b/src/vnet/fib/ip4_fib.c @@ -567,10 +567,18 @@ 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 %=8ld\n", "IPv4 unicast", pool_elts(ip4_main.fibs), mheap_bytes(ip4_main.mtrie_mheap)); +#else + s = format(s, "%=30s %=6d %=8ld\n", + "IPv4 unicast", + pool_elts(ip4_main.fibs), + mspace_footprint(ip4_main.mtrie_mheap)); +#endif + return (s); } diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c index 5aa9b926483..97c25074639 100644 --- a/src/vnet/ip/ip4_mtrie.c +++ b/src/vnet/ip/ip4_mtrie.c @@ -812,7 +812,11 @@ ip4_mtrie_module_init (vlib_main_t * vm) if (0 == im->mtrie_heap_size) im->mtrie_heap_size = IP4_FIB_DEFAULT_MTRIE_HEAP_SIZE; +#if USE_DLMALLOC == 0 im->mtrie_mheap = mheap_alloc (0, im->mtrie_heap_size); +#else + im->mtrie_mheap = create_mspace (im->mtrie_heap_size, 1 /* locked */ ); +#endif /* Burn one ply so index 0 is taken */ old_heap = clib_mem_set_heap (ip4_main.mtrie_mheap); |