X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d78311982007a2c778ff692c35c9d2787642c199..d013cec453ee914baf3c62275ea2042c41e7c270:/include/xbt/mmalloc.h

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index d3d23a7671..0a5dadee72 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -18,44 +18,61 @@
 #  include <stdio.h>            /* for NULL */
 #endif
 
-/* Allocate SIZE bytes of memory.  */
-extern void *mmalloc(void *md, size_t size);
+#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
+ * 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 (and memset it to 0).  */
+XBT_PUBLIC( void ) *mmalloc(xbt_mheap_t md, size_t size);
+
+/* Allocate SIZE bytes of memory (and don't mess with it) */
+void *mmalloc_no_memset(xbt_mheap_t mdp, 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);
+XBT_PUBLIC( 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);
+XBT_PUBLIC( 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);
+XBT_PUBLIC( 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);
+XBT_PUBLIC( void ) *mvalloc(xbt_mheap_t md, size_t size);
 
-extern void *mmalloc_attach(int fd, void *baseaddr);
+XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new(int fd, void *baseaddr);
 
-extern void mmalloc_detach_no_free(void *md);
+XBT_PUBLIC( void ) xbt_mheap_destroy_no_free(xbt_mheap_t md);
 
-extern void *mmalloc_detach(void *md);
+XBT_PUBLIC( 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);
+XBT_PUBLIC( 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, 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 init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2);
+void match_equals(xbt_dynar_t list, xbt_dynar_t equals);
+int compare_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dynar_t equals);
 
-/* 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);
+void mmalloc_backtrace_display(void *addr);
 
+int is_free_area(void *area, xbt_mheap_t heap);
 
+size_t mmalloc_get_bytes_used(xbt_mheap_t);
 
 #endif                          /* MMALLOC_H */