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

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index f167e248b7..d3d23a7671 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,64 +17,38 @@
 #  include <sys/types.h>        /* for size_t */
 #  include <stdio.h>            /* for NULL */
 #endif
-//#include "./include/ansidecl.h"
 
 /* Allocate SIZE bytes of memory.  */
-
 extern void *mmalloc(void *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);
 
 /* Free a block allocated by `mmalloc', `mrealloc' or `mcalloc'.  */
-
 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));
-
-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_no_free(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);
-
 /* 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);
+extern int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr);
 
 extern void mmalloc_display_info_heap(void *h);