diff options
author | 2018-07-04 10:56:23 -0400 | |
---|---|---|
committer | 2018-07-18 12:09:42 +0000 | |
commit | 6a5adc369591fcac2447e9809deaa22f56b53911 (patch) | |
tree | c9a56b1ed0d5e8eb2f21a843552c6c0bc6df5597 /src/vpp | |
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/vpp')
-rw-r--r-- | src/vpp/stats/stats.c | 4 | ||||
-rw-r--r-- | src/vpp/vnet/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vpp/stats/stats.c b/src/vpp/stats/stats.c index 66d9d32a314..f827fe9f85f 100644 --- a/src/vpp/stats/stats.c +++ b/src/vpp/stats/stats.c @@ -2474,12 +2474,12 @@ stats_thread_fn (void *arg) pthread_sigmask (SIG_SETMASK, &s, 0); } + clib_mem_set_heap (w->thread_mheap); + if (vec_len (tm->thread_prefix)) vlib_set_thread_name ((char *) format (0, "%v_stats%c", tm->thread_prefix, '\0')); - clib_mem_set_heap (w->thread_mheap); - while (1) { ip46_fib_stats_delay (sm, sm->stats_poll_interval_in_seconds, diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index 9a804eb3641..9d77a44c2ce 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -263,7 +263,7 @@ defaulted: vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE); /* Allocate main heap */ - if (clib_mem_init (0, main_heap_size)) + if (clib_mem_init_thread_safe (0, main_heap_size)) { vm->init_functions_called = hash_create (0, /* value bytes */ 0); vpe_main_init (vm); |