X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..574815d2ca9adca6638515b5b658dc9afac52702:/include/xbt/mmalloc.h

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index ca4d89dd41..a8b49c46f4 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -1,75 +1,70 @@
-#ifndef MMALLOC_H
-#define MMALLOC_H 1
-
-#ifdef HAVE_STDDEF_H
-#  include <stddef.h>
-#else
-#  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);
+/* Copyright (c) 2010-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-/* Free a block allocated by `mmalloc', `mrealloc' or `mcalloc'.  */
+/* 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. */
 
-extern void mfree(void *md, void *ptr);
+/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   This file was then part of the GNU C Library. */
 
-/* Allocate SIZE bytes allocated to ALIGNMENT bytes.  */
+#ifndef SIMGRID_MMALLOC_H
+#define SIMGRID_MMALLOC_H 1
 
-extern void *mmemalign(void *md, size_t alignment, size_t size);
+#include "src/internal_config.h"
+#if HAVE_MMALLOC
 
-/* Allocate SIZE bytes on a page boundary.  */
+# include <sys/types.h>        /* for size_t */
+# include <stdio.h>            /* for NULL */
 
-extern void *mvalloc(void *md, size_t size);
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
 
-/* Activate a standard collection of debugging hooks.  */
+SG_BEGIN_DECL()
 
-extern int mmcheck(void *md, void (*func) (void));
+/* 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 s_xbt_mheap_t;
+typedef struct mdesc *xbt_mheap_t;
 
-extern int mmcheckf(void *md, void (*func) (void), int force);
+/* Allocate SIZE bytes of memory (and memset it to 0).  */
+XBT_PUBLIC( void ) *mmalloc(xbt_mheap_t md, size_t size);
 
-/* Pick up the current statistics. (see FIXME elsewhere) */
+/* Allocate SIZE bytes of memory (and don't mess with it) */
+void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size);
 
-extern struct mstats mmstats(void *md);
+/* Re-allocate the previously allocated block in void*, making the new block SIZE bytes long.  */
+XBT_PUBLIC( void ) *mrealloc(xbt_mheap_t md, void *ptr, size_t size);
 
-extern void *mmalloc_attach(int fd, void *baseaddr);
+/* Free a block allocated by `mmalloc', `mrealloc' or `mcalloc'.  */
+XBT_PUBLIC( void ) mfree(xbt_mheap_t md, void *ptr);
 
-extern void mmalloc_pre_detach(void *md);
+XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new(int fd, void *baseaddr);
 
-extern void *mmalloc_detach(void *md);
+#define XBT_MHEAP_OPTION_MEMSET 1
 
-extern int mmalloc_setkey(void *md, int keynum, void *key);
+XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new_options(int fd, void *baseaddr, int options);
 
-extern void *mmalloc_getkey(void *md, int keynum);
+XBT_PUBLIC( void ) xbt_mheap_destroy_no_free(xbt_mheap_t md);
 
-// 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);
+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);
+xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap);
+xbt_mheap_t mmalloc_get_current_heap(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                          /* MMALLOC_H */
+#endif
+#endif                          /* SIMGRID_MMALLOC_H */