X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41ac7e58ef132dea8cea9addf213671ae38229ac..9b8c19c2b3028ebeef9f76f159af56acd5739c6d:/include/xbt/mmalloc.h diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h index 6c520bfe1e..df40f030d3 100644 --- a/include/xbt/mmalloc.h +++ b/include/xbt/mmalloc.h @@ -19,6 +19,7 @@ #endif #include "xbt/dynar.h" +#include "xbt/dict.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 @@ -42,12 +43,6 @@ XBT_PUBLIC( void ) *mrealloc(xbt_mheap_t md, void *ptr, size_t size); /* Free a block allocated by `mmalloc', `mrealloc' or `mcalloc'. */ XBT_PUBLIC( void ) mfree(xbt_mheap_t md, void *ptr); -/* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ -XBT_PUBLIC( void ) *mmemalign(xbt_mheap_t md, size_t alignment, size_t size); - -/* Allocate SIZE bytes on a page boundary. */ -XBT_PUBLIC( void ) *mvalloc(xbt_mheap_t md, size_t size); - XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new(int fd, void *baseaddr); XBT_PUBLIC( void ) xbt_mheap_destroy_no_free(xbt_mheap_t md); @@ -64,15 +59,9 @@ xbt_mheap_t mmalloc_get_current_heap(void); 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); void init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t to_ignore1, xbt_dynar_t to_ignore2); -void match_equals(xbt_dynar_t list); -int compare_area(void *area1, void* area2, xbt_dynar_t previous); +int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type, int pointer_level); void reset_heap_information(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); +int get_pointed_area_size(void *area, int heap); size_t mmalloc_get_bytes_used(xbt_mheap_t);