commit 6a5adc369591fcac2447e9809deaa22f56b53911
author Dave Barach <dave@barachs.net> Wed Jul 04 10:56:23 2018 -0400
committer Damjan Marion <dmarion@me.com> Wed Jul 18 12:09:42 2018 +0000
tree c9a56b1ed0d5e8eb2f21a843552c6c0bc6df5597
parent 2a3fb1a28b170ac1d37815983611e83d148811d4

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>

src/svm/svm.c

diff --git a/src/svm/svm.c b/src/svm/svm.c
index d958c83..aa84a2f 100644
--- a/src/svm/svm.c
+++ b/src/svm/svm.c
@@ -236,6 +236,7 @@
 		}
 	    }
 	}
+#if USE_DLMALLOC == 0
       s = format (s, "  rgn heap stats: %U", format_mheap,
 		  rp->region_heap, 0);
       if ((rp->flags & SVM_FLAGS_MHEAP) && rp->data_heap)
@@ -244,6 +245,7 @@
 		      rp->data_heap, 1);
 	}
       s = format (s, "\n");
+#endif
     }
 
   return (s);
@@ -339,12 +341,18 @@
 
   if (a->flags & SVM_FLAGS_MHEAP)
     {
+#if USE_DLMALLOC == 0
       mheap_t *heap_header;
       rp->data_heap =
 	mheap_alloc_with_flags ((void *) (rp->data_base), map_size,
 				MHEAP_FLAG_DISABLE_VM);
       heap_header = mheap_header (rp->data_heap);
       heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+#else
+      rp->data_heap = create_mspace_with_base (rp->data_base,
+					       map_size, 1 /* locked */ );
+      mspace_disable_expand (rp->data_heap);
+#endif
 
       rp->flags |= SVM_FLAGS_MHEAP;
     }
@@ -518,12 +526,22 @@
   rp->virtual_base = a->baseva;
   rp->virtual_size = a->size;
 
+#if USE_DLMALLOC == 0
   rp->region_heap =
     mheap_alloc_with_flags (uword_to_pointer
 			    (a->baseva + MMAP_PAGESIZE, void *),
 			    (a->pvt_heap_size !=
 			     0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE,
 			    MHEAP_FLAG_DISABLE_VM);
+#else
+  rp->region_heap = create_mspace_with_base
+    (uword_to_pointer (a->baseva + MMAP_PAGESIZE, void *),
+     (a->pvt_heap_size !=
+      0) ? a->pvt_heap_size : SVM_PVT_MHEAP_SIZE, 1 /* locked */ );
+
+  mspace_disable_expand (rp->region_heap);
+#endif
+
   oldheap = svm_push_pvt_heap (rp);
 
   rp->region_name = (char *) format (0, "%s%c", a->name, 0);