X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d929149dc5f210fc2599db0407351ba27ad3a2ec..5c866e44376ab5dcb4fcfc2725cdd6d47168236a:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index 67c5bba166..bca9acddeb 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,7 +1,6 @@ /* Declarations for `mmalloc' and friends. */ -/* Copyright (c) 2010-2014. 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. */ @@ -11,26 +10,22 @@ Written May 1989 by Mike Haertel. Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */ -#ifndef __MMPRIVATE_H -#define __MMPRIVATE_H 1 +#ifndef XBT_MMPRIVATE_H +#define XBT_MMPRIVATE_H 1 -#include "portable.h" -#include "xbt/xbt_os_thread.h" +#include +#include + +#include "swag.h" +#include "src/internal_config.h" #include "xbt/mmalloc.h" #include "xbt/ex.h" #include "xbt/dynar.h" -#include "xbt/swag.h" #include #include -#ifdef HAVE_LIMITS_H -# include -#else -# ifndef CHAR_BIT -# define CHAR_BIT 8 -# endif -#endif +#include #define MMALLOC_MAGIC "mmalloc" /* Mapped file magic number */ #define MMALLOC_MAGIC_SIZE 8 /* Size of magic number buf */ @@ -50,14 +45,13 @@ #define BLOCKIFY(SIZE) (((SIZE) + BLOCKSIZE - 1) / BLOCKSIZE) /* We keep fragment-specific meta-data for introspection purposes, and these - * information are kept in fixed lenght arrays. Here is the computation of + * information are kept in fixed length arrays. Here is the computation of * that size. * * Never make SMALLEST_POSSIBLE_MALLOC smaller than sizeof(list) because we * need to enlist the free fragments. */ -//#define SMALLEST_POSSIBLE_MALLOC (sizeof(struct list)) #define SMALLEST_POSSIBLE_MALLOC (16*sizeof(struct list)) #define MAX_FRAGMENT_PER_BLOCK (BLOCKSIZE / SMALLEST_POSSIBLE_MALLOC) @@ -94,6 +88,8 @@ #define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase)) +SG_BEGIN_DECL + /* Doubly linked lists of free fragments. */ struct list { struct list *next; @@ -110,19 +106,6 @@ struct mstats size_t bytes_free; /* Byte total of chunks in the free list. */ }; -typedef struct s_heap_area{ - int valid; - int block; - int fragment; -}s_heap_area_t, *heap_area_t; - -typedef struct s_heap_area_pair{ - int block1; - int fragment1; - int block2; - int fragment2; -}s_heap_area_pair_t, *heap_area_pair_t; - #define MMALLOC_TYPE_HEAPINFO (-2) #define MMALLOC_TYPE_FREE (-1) #define MMALLOC_TYPE_UNFRAGMENTED 0 @@ -157,20 +140,17 @@ 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 { size_t nfree; /* Free fragments in a fragmented block. */ ssize_t frag_size[MAX_FRAGMENT_PER_BLOCK]; - //void *bt[MAX_FRAGMENT_PER_BLOCK][XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */ int ignore[MAX_FRAGMENT_PER_BLOCK]; } busy_frag; struct { size_t size; /* Size (in blocks) of a large cluster. */ size_t busy_size; /* Actually used space, in bytes */ - //void *bt[XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */ - //int bt_size; int ignore; } busy_block; /* Heap information for a free block (that may be the first of a free cluster). */ @@ -190,13 +170,9 @@ typedef struct { * if such a file exists. * */ struct mdesc { - /** @brief Mutex locking the access to the heap */ pthread_mutex_t mutex; - /** @brief Number of processes that attached the heap */ - unsigned int refcount; - /** @brief Chained lists of mdescs */ struct mdesc *next_mdesc; @@ -240,7 +216,7 @@ struct mdesc { /* @brief List of all blocks containing free fragments of a given size. * - * The array indice is the log2 of requested size. + * The array index is the log2 of requested size. * Actually only the sizes 8->11 seem to be used, but who cares? */ s_xbt_swag_t fraghead[BLOCKLOG]; @@ -266,33 +242,20 @@ struct mdesc { */ void *top; - /** @brief Open file descriptor for the file to which this malloc heap is mapped - * - * If this value is negative, MAP_ANONYMOUS memory is used. - * - * Also note that it may change each time the region is mapped and unmapped. */ - int fd; - /* @brief Instrumentation */ struct mstats heapstats; - }; /* Bits to look at in the malloc descriptor flags word */ #define MMALLOC_DEVZERO (1 << 0) /* Have mapped to /dev/zero */ -#define MMALLOC_ANONYMOUS (1 << 1) /* Use anonymous mapping */ -#define MMALLOC_INITIALIZED (1 << 2) /* Initialized mmalloc */ +#define MMALLOC_INITIALIZED (1 << 1) /* Initialized mmalloc */ /* A default malloc descriptor for the single sbrk() managed region. */ -XBT_PUBLIC( struct mdesc ) *__mmalloc_default_mdp; - -/* Remap a mmalloc region that was previously mapped. */ +XBT_PUBLIC_DATA struct mdesc* __mmalloc_default_mdp; -XBT_PUBLIC( void *)__mmalloc_remap_core(xbt_mheap_t mdp); - -XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size); +XBT_PUBLIC void* mmorecore(struct mdesc* mdp, ssize_t size); /** Thread-safety (if the mutex is already created) * @@ -300,30 +263,13 @@ XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size); * in a model-checking enabled tree. Without this protection, our malloc * implementation will not like multi-threading AT ALL. */ -#define LOCK(mdp) pthread_mutex_lock(&mdp->mutex) -#define UNLOCK(mdp) pthread_mutex_unlock(&mdp->mutex) - -static XBT_INLINE void mmalloc_paranoia(struct mdesc *mdp){ +#define LOCK(mdp) pthread_mutex_lock(&(mdp)->mutex) +#define UNLOCK(mdp) pthread_mutex_unlock(&(mdp)->mutex) - /* nothing to fear for no */ +XBT_PRIVATE int malloc_use_mmalloc(void); -} +XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); -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; - } -} +SG_END_DECL -void mmcheck(xbt_mheap_t heap); - -int mmalloc_exec_using_mm(int argc, const char** argv); -void mmalloc_ensure_using_mm(int argc, const char** argv); - -size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); - -#endif /* __MMPRIVATE_H */ +#endif