X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/655040c6a7e0502c81e30219b8619e0c70b575dd..8eb44d6e2b6c63e7a18fe315f00da4dca0957324:/include/xbt/mmalloc.h

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index f167e248b7..f7a279e6a9 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -1,3 +1,13 @@
+/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   This file was then part of the GNU C Library. */
+
+/* Copyright (c) 2010-2012. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+
 #ifndef MMALLOC_H
 #define MMALLOC_H 1
 
@@ -7,70 +17,50 @@
 #  include <sys/types.h>        /* for size_t */
 #  include <stdio.h>            /* for NULL */
 #endif
-//#include "./include/ansidecl.h"
 
-/* Allocate SIZE bytes of memory.  */
+/* 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;
 
-extern void *mmalloc(void *md, size_t size);
+/* Allocate SIZE bytes of memory.  */
+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(xbt_mheap_t md, size_t size);
 
-extern void *mvalloc(void *md, size_t size);
-
-/* Activate a standard collection of debugging hooks.  */
+extern xbt_mheap_t xbt_mheap_new(int fd, void *baseaddr);
 
-extern int mmcheck(void *md, void (*func) (void));
+extern void xbt_mheap_destroy_no_free(xbt_mheap_t md);
 
-extern int mmcheckf(void *md, void (*func) (void), int force);
-
-/* Pick up the current statistics. (see FIXME elsewhere) */
-
-extern struct mstats mmstats(void *md);
-
-extern void *mmalloc_attach(int fd, void *baseaddr);
-
-extern void mmalloc_pre_detach(void *md);
-
-extern void *mmalloc_detach(void *md);
-
-extern int mmalloc_setkey(void *md, int keynum, void *key);
-
-extern void *mmalloc_getkey(void *md, int keynum);
-
-// FIXME: this function is not implemented anymore?
-//extern int mmalloc_errno (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);
+/* 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);