# include <stdio.h> /* for NULL */
#endif
+/* Datatype representing a separate heap. The whole point of the mmalloc module
+ * is to allow several such heaps in the process. It thus works by redefining
+ * all the classical memory management functions (malloc and friends) with an
+ * extra first argument: the heap in which the memory is to be taken.
+ *
+ * The heap structure itself is an opaque object that shouldnt be messed with.
+ */
+typedef struct mdesc *xbt_mheap_t;
+
/* Allocate SIZE bytes of memory. */
-extern void *mmalloc(void *md, size_t size);
+extern void *mmalloc(xbt_mheap_t md, size_t size);
/* Re-allocate the previously allocated block in void*, making the new block
SIZE bytes long. */
-extern void *mrealloc(void *md, void *ptr, size_t size);
-
-/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */
-extern void *mcalloc(void *md, size_t nmemb, size_t size);
+extern void *mrealloc(xbt_mheap_t md, void *ptr, size_t size);
/* Free a block allocated by `mmalloc', `mrealloc' or `mcalloc'. */
-extern void mfree(void *md, void *ptr);
+extern void mfree(xbt_mheap_t md, void *ptr);
/* Allocate SIZE bytes allocated to ALIGNMENT bytes. */
-extern void *mmemalign(void *md, size_t alignment, size_t size);
+extern void *mmemalign(xbt_mheap_t md, size_t alignment, size_t size);
/* Allocate SIZE bytes on a page boundary. */
-extern void *mvalloc(void *md, size_t size);
+extern void *mvalloc(xbt_mheap_t md, size_t size);
-extern void *mmalloc_attach(int fd, void *baseaddr);
+extern xbt_mheap_t xbt_mheap_new(int fd, void *baseaddr);
-extern void mmalloc_pre_detach(void *md);
+extern void xbt_mheap_destroy_no_free(xbt_mheap_t md);
-extern void *mmalloc_detach(void *md);
+extern void *xbt_mheap_destroy(xbt_mheap_t md);
/* return the heap used when NULL is passed as first argument to any mm* function */
-extern void *mmalloc_get_default_md(void);
-
-extern int mmtrace(void);
+extern xbt_mheap_t mmalloc_get_default_md(void);
-extern void *mmalloc_findbase(int size);
-
-extern int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr);
+/* To change the heap used when using the legacy version malloc/free/realloc and such */
+void mmalloc_set_current_heap(xbt_mheap_t new_heap);
+xbt_mheap_t mmalloc_get_current_heap(void);
-extern void mmalloc_display_info_heap(void *h);
+int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2);
+int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2);
-/* To change the heap used when using the legacy version malloc/free/realloc and such */
-void mmalloc_set_current_heap(void *new_heap);
-void *mmalloc_get_current_heap(void);
+void mmalloc_backtrace_block_display(void* heapinfo, int block);
+void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag);
