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/svm/ssvm.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/svm/ssvm.c')
| -rw-r--r-- | src/svm/ssvm.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c index 66e38ebf864..0305278a6b6 100644 --- a/src/svm/ssvm.c +++ b/src/svm/ssvm.c @@ -29,9 +29,6 @@ int ssvm_master_init_shm (ssvm_private_t * ssvm) { int ssvm_fd; -#if USE_DLMALLOC == 0 - int mh_flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE; -#endif clib_mem_vm_map_t mapa = { 0 }; u8 junk = 0, *ssvm_filename; ssvm_shared_header_t *sh; @@ -104,15 +101,10 @@ ssvm_master_init_shm (ssvm_private_t * ssvm) sh->ssvm_size = ssvm->ssvm_size; sh->ssvm_va = pointer_to_uword (sh); sh->type = SSVM_SEGMENT_SHM; -#if USE_DLMALLOC == 0 - sh->heap = mheap_alloc_with_flags (((u8 *) sh) + page_size, - ssvm->ssvm_size - page_size, mh_flags); -#else sh->heap = create_mspace_with_base (((u8 *) sh) + page_size, ssvm->ssvm_size - page_size, 1 /* locked */ ); mspace_disable_expand (sh->heap); -#endif oldheap = ssvm_push_heap (sh); sh->name = format (0, "%s", ssvm->name, 0); @@ -261,17 +253,10 @@ ssvm_master_init_memfd (ssvm_private_t * memfd) sh->ssvm_va = pointer_to_uword (sh); sh->type = SSVM_SEGMENT_MEMFD; -#if USE_DLMALLOC == 0 - uword flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE; - - sh->heap = mheap_alloc_with_flags (((u8 *) sh) + page_size, - memfd->ssvm_size - page_size, flags); -#else sh->heap = create_mspace_with_base (((u8 *) sh) + page_size, memfd->ssvm_size - page_size, 1 /* locked */ ); mspace_disable_expand (sh->heap); -#endif oldheap = ssvm_push_heap (sh); sh->name = format (0, "%s", memfd->name, 0); ssvm_pop_heap (oldheap); |