X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..5c866e44376ab5dcb4fcfc2725cdd6d47168236a:/src/include/xbt/mmalloc.h diff --git a/src/include/xbt/mmalloc.h b/src/include/xbt/mmalloc.h index 4db71119f6..33235944a6 100644 --- a/src/include/xbt/mmalloc.h +++ b/src/include/xbt/mmalloc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. 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. */ @@ -7,7 +7,7 @@ This file was then part of the GNU C Library. */ #ifndef SIMGRID_MMALLOC_H -#define SIMGRID_MMALLOC_H 1 +#define SIMGRID_MMALLOC_H #include "src/internal_config.h" @@ -17,13 +17,13 @@ #include "xbt/dict.h" #include "xbt/dynar.h" -SG_BEGIN_DECL() +SG_BEGIN_DECL /* 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. + * The heap structure itself is an opaque object that shouldn't be messed with. */ typedef struct mdesc s_xbt_mheap_t; typedef s_xbt_mheap_t* xbt_mheap_t; @@ -41,29 +41,18 @@ 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); -XBT_PUBLIC xbt_mheap_t xbt_mheap_new(int fd, void* baseaddr); - #define XBT_MHEAP_OPTION_MEMSET 1 -XBT_PUBLIC xbt_mheap_t xbt_mheap_new_options(int fd, void* baseaddr, int options); +XBT_PUBLIC xbt_mheap_t xbt_mheap_new(void* baseaddr, int options); XBT_PUBLIC void xbt_mheap_destroy_no_free(xbt_mheap_t 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 */ -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 */ -xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap); +/* To get the heap used when using the legacy version malloc/free/realloc and such */ 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); - #endif -SG_END_DECL() +SG_END_DECL #endif /* SIMGRID_MMALLOC_H */