X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae701792ae00d4b822b890780619878e0a624980..ba0369a5f611172ea57bc1fa6cd3df9f8e5ea439:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index ce97df49df..640e09fe28 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,6 +1,6 @@ /* Declarations for `mmalloc' and friends. */ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -16,12 +16,12 @@ #include #include +#include "swag.h" #include "src/internal_config.h" #include "xbt/xbt_os_thread.h" #include "xbt/mmalloc.h" #include "xbt/ex.h" #include "xbt/dynar.h" -#include "xbt/swag.h" #include #include @@ -148,7 +148,7 @@ typedef struct { int type; /* 0: busy large block >0: busy fragmented (fragments of size 2^type bytes) <0: free block */ - + union { /* Heap information for a busy block. */ struct { @@ -294,29 +294,8 @@ XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size); #define LOCK(mdp) pthread_mutex_lock(&mdp->mutex) #define UNLOCK(mdp) pthread_mutex_unlock(&mdp->mutex) -static inline void mmalloc_paranoia(struct mdesc *mdp){ - - /* nothing to fear for no */ - -} - -static inline int mmalloc_get_increment(malloc_info* heapinfo) { - if (heapinfo->type < 0) { - return heapinfo->free_block.size; - } else if (heapinfo->type == 0) { - return heapinfo->busy_block.size; - } else { - return 1; - } -} - -XBT_PRIVATE void mmcheck(xbt_mheap_t heap); - XBT_PRIVATE int malloc_use_mmalloc(void); -XBT_PRIVATE int mmalloc_exec_using_mm(int argc, const char** argv); -XBT_PRIVATE void mmalloc_ensure_using_mm(int argc, const char** argv); - XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); SG_END_DECL()