From 6a5adc369591fcac2447e9809deaa22f56b53911 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 4 Jul 2018 10:56:23 -0400 Subject: 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 --- src/vppinfra/mheap.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/vppinfra/mheap.h') diff --git a/src/vppinfra/mheap.h b/src/vppinfra/mheap.h index 5b7cdfbaf8d..918adb137d7 100644 --- a/src/vppinfra/mheap.h +++ b/src/vppinfra/mheap.h @@ -38,6 +38,8 @@ #ifndef included_mheap_h #define included_mheap_h +#if USE_DLMALLOC == 0 + #include #include /* clib_error_t */ #include /* clib_mem_usage_t */ @@ -58,6 +60,7 @@ mheap_get (void *v, uword size, uword * offset_return) */ void *mheap_alloc (void *memory, uword memory_bytes); void *mheap_alloc_with_flags (void *memory, uword memory_bytes, uword flags); +void *mheap_alloc_with_lock (void *memory, uword size, int locked); #define mheap_free(v) (v) = _mheap_free(v) void *_mheap_free (void *v); @@ -83,6 +86,13 @@ void mheap_trace (void *v, int enable); /* Test routine. */ int test_mheap_main (unformat_input_t * input); +#else /* USE_DLMALLOC */ +/* Format mheap data structures as string. */ +u8 *format_mheap (u8 * s, va_list * va); +void *mheap_alloc_with_lock (void *memory, uword size, int locked); + +#endif /* USE_DLMALLOC */ + #endif /* included_mheap_h */ /* -- cgit 1.2.3-korg