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

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index 8ecb836bd0..35c68e0730 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -1,3 +1,12 @@
+/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   This file was then part of the GNU C Library. */
+
+/* Copyright (c) 2010-2014. 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,71 +16,56 @@
 #  include <sys/types.h>        /* for size_t */
 #  include <stdio.h>            /* for NULL */
 #endif
-//#include "./include/ansidecl.h"
 
-/* Allocate SIZE bytes of memory.  */
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+#include "mc/datatypes.h"
 
-extern void *mmalloc(void *md, size_t size);
+/* 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;
 
-/* Re-allocate the previously allocated block in void*, making the new block
-   SIZE bytes long.  */
+/* Allocate SIZE bytes of memory (and memset it to 0).  */
+XBT_PUBLIC( void ) *mmalloc(xbt_mheap_t md, size_t size);
 
-extern void *mrealloc(void *md, void *ptr, 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);
 
-/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0.  */
+/* Re-allocate the previously allocated block in void*, making the new block
+   SIZE bytes long.  */
 
-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'.  */
+XBT_PUBLIC( void ) mfree(xbt_mheap_t md, void *ptr);
 
-extern void mfree(void *md, void *ptr);
-
-/* Allocate SIZE bytes allocated to ALIGNMENT bytes.  */
-
-extern void *mmemalign(void *md, size_t alignment, size_t size);
-
-/* Allocate SIZE bytes on a page boundary.  */
-
-extern void *mvalloc(void *md, size_t size);
-
-/* Activate a standard collection of debugging hooks.  */
-
-extern int mmcheck(void *md, void (*func) (void));
+XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new(int fd, void *baseaddr);
 
-extern int mmcheckf(void *md, void (*func) (void), int force);
+XBT_PUBLIC( void ) xbt_mheap_destroy_no_free(xbt_mheap_t md);
 
-/* 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);
+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);
-
-extern int mmtrace(void);
-
-extern void *mmalloc_findbase(int size);
-
-extern int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr);
-
-extern void mmalloc_display_info_heap(void *h);
+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(void *new_heap);
-void *mmalloc_get_current_heap(void);
+void mmalloc_set_current_heap(xbt_mheap_t new_heap);
+xbt_mheap_t mmalloc_get_current_heap(void);
+
+struct s_mc_snapshot;
 
+int mmalloc_compare_heap(struct s_mc_snapshot* snapshot1, struct s_mc_snapshot* snapshot2, xbt_mheap_t heap1, xbt_mheap_t heap2);
+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, dw_type_t 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);
 
 #endif                          /* MMALLOC_H */