X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08ddd90ede6ae87880ab6aefe213001b224de841..b024b9e443552c94609fc56a240cdb199a329853:/src/include/xbt/mmalloc.h diff --git a/src/include/xbt/mmalloc.h b/src/include/xbt/mmalloc.h index ab6ca00e2a..792e9e9eaf 100644 --- a/src/include/xbt/mmalloc.h +++ b/src/include/xbt/mmalloc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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,10 +7,9 @@ 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" -#if HAVE_MMALLOC #include /* for NULL */ #include /* for size_t */ @@ -27,8 +26,9 @@ SG_BEGIN_DECL() * 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; +typedef s_xbt_mheap_t* xbt_mheap_t; +#if HAVE_MMALLOC /* Allocate SIZE bytes of memory (and memset it to 0). */ XBT_PUBLIC void* mmalloc(xbt_mheap_t md, size_t size); @@ -51,19 +51,10 @@ 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() -#endif #endif /* SIMGRID_MMALLOC_H */