Merge pull request #1 from hlef/staging

Update Mimalloc to match recent main tree changes

Author: hlef

Config.uk

@@ -1,3 +1,9 @@
+# Invisible option that is used to detect
+# if LIBMIMALLOC is available for configuration
+config LIBMIMALLOC_INCLUDED
+	   bool
+	   default y
+
 menuconfig LIBMIMALLOC
 	bool "mimalloc: a compact general purpose allocator with excellent performance"
 	default n

README.md

@@ -6,7 +6,6 @@ Unikraft as an external library.
 
 How to use this allocator in your unikernel application:
 
-- apply main-tree.patch to the main tree
 - select "Mimalloc" in `ukboot > Default memory allocator`
 - pass at least 256MiB of memory to the unikernel
 

glue.c

@@ -234,11 +234,13 @@ struct uk_alloc *uk_mimalloc_init(void *base, size_t len)
 	 * cases we want Mimalloc to be the default allocator.
 	 * FIXME: add uk_allocregion_init_noregister() that initializes a region
 	 * allocator without registering it.
+	 * FIXME: add support for maxalloc, availmem, and addmem.
 	 */
 	uk_alloc_init_malloc(a, uk_mimalloc_region_malloc, uk_calloc_compat,
 				uk_realloc_compat, uk_mimalloc_region_free,
 				uk_mimalloc_region_posix_memalign,
-				uk_memalign_compat, NULL);
+				uk_memalign_compat, NULL /* maxalloc */,
+				NULL /* availmem */, NULL /* addmem */);
 
 	__region_alloc = uk_allocregion_init((void *)((uintptr_t) base +
 						metalen), len - metalen);