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/vppinfra/mheap.h | |
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/vppinfra/mheap.h')
-rw-r--r-- | src/vppinfra/mheap.h | 10 |
1 files changed, 10 insertions, 0 deletions
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 <vppinfra/vec.h> #include <vppinfra/error.h> /* clib_error_t */ #include <vppinfra/mem.h> /* 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 */ /* |