# include <stdio.h> /* for NULL */
#endif
+#include "xbt/dynar.h"
+
/* 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
SIZE bytes long. */
extern void *mrealloc(xbt_mheap_t md, void *ptr, size_t size);
-/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */
-extern void *mcalloc(xbt_mheap_t md, size_t nmemb, size_t size);
-
/* Free a block allocated by `mmalloc', `mrealloc' or `mcalloc'. */
extern void mfree(xbt_mheap_t md, void *ptr);
/* Allocate SIZE bytes on a page boundary. */
extern void *mvalloc(xbt_mheap_t md, size_t size);
-extern xbt_mheap_t mmalloc_attach(int fd, void *baseaddr);
+extern xbt_mheap_t xbt_mheap_new(int fd, void *baseaddr);
-extern void mmalloc_detach_no_free(xbt_mheap_t md);
+extern void xbt_mheap_destroy_no_free(xbt_mheap_t md);
-extern void *mmalloc_detach(xbt_mheap_t 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 xbt_mheap_t mmalloc_get_default_md(void);
-extern void *mmalloc_findbase(int size);
-
-extern void mmalloc_display_info_heap(xbt_mheap_t h);
-
/* 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);
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr);
+int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stacks1, xbt_dynar_t *stacks2, xbt_dynar_t *equals);
+int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2);
+
+void mmalloc_backtrace_block_display(void* heapinfo, int block);
+void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag);
+
+int is_free_area(void *area, xbt_mheap_t heap);
+
#endif /* MMALLOC_H */