X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df6f01f7876ff2b5dc12e3eeee31e963955f3d68..ac151e89b9b3cad0074cd85f01334a3404132082:/include/xbt/mmalloc.h diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h index 13222c6f1d..6523a01304 100644 --- a/include/xbt/mmalloc.h +++ b/include/xbt/mmalloc.h @@ -32,6 +32,7 @@ SG_BEGIN_DECL() * * The heap structure itself is an opaque object that shouldnt be messed with. */ +typedef struct mdesc s_xbt_mheap_t; typedef struct mdesc *xbt_mheap_t; /* Allocate SIZE bytes of memory (and memset it to 0). */ @@ -62,7 +63,7 @@ XBT_PUBLIC( void ) *xbt_mheap_destroy(xbt_mheap_t md); XBT_PUBLIC( xbt_mheap_t ) mmalloc_get_default_md(void); /* 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_set_current_heap(xbt_mheap_t new_heap); xbt_mheap_t mmalloc_get_current_heap(void); struct s_mc_snapshot; @@ -71,12 +72,14 @@ struct s_dw_type; int mmalloc_compare_heap(struct s_mc_snapshot* snapshot1, struct s_mc_snapshot* snapshot2); int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2); int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t to_ignore1, xbt_dynar_t to_ignore2); -int compare_heap_area(void *area1, void* area2, struct s_mc_snapshot* snapshot1, struct s_mc_snapshot* snapshot2, xbt_dynar_t previous, struct s_dw_type *type, int pointer_level); +int compare_heap_area(int process_index, const void *area1, const void* area2, struct s_mc_snapshot* snapshot1, struct s_mc_snapshot* snapshot2, xbt_dynar_t previous, struct s_dw_type *type, int pointer_level); void reset_heap_information(void); size_t mmalloc_get_bytes_used(xbt_mheap_t); ssize_t mmalloc_get_busy_size(xbt_mheap_t, void *ptr); +void* malloc_no_memset(size_t n); + SG_END_DECL() #endif