X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a308bb217e5abbd93413e23cb59776c3f6d1d8db..9b3780913f771e32ac6686a7f97b1a8248f11b27:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index 5e2a7ed407..95d52c1784 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-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. */ @@ -11,18 +10,29 @@ 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 +#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 #include +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif + #ifdef HAVE_LIMITS_H # include #else @@ -93,6 +103,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; @@ -109,18 +121,10 @@ 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 +/* >0 values are fragmented blocks */ /* Data structure giving per-block information. * @@ -151,7 +155,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 { @@ -176,87 +180,98 @@ typedef struct { }; } malloc_info; -/* Internal structure that defines the format of the malloc-descriptor. - This gets written to the base address of the region that mmalloc is - managing, and thus also becomes the file header for the mapped file, - if such a file exists. */ - +/** @brief Descriptor of a mmalloc area + * + * Internal structure that defines the format of the malloc-descriptor. + * This gets written to the base address of the region that mmalloc is + * managing, and thus also becomes the file header for the mapped file, + * if such a file exists. + * */ struct mdesc { - /* Semaphore locking the access to the heap */ - sem_t sem; + /** @brief Mutex locking the access to the heap */ + pthread_mutex_t mutex; - /* Number of processes that attached the heap */ + /** @brief Number of processes that attached the heap */ unsigned int refcount; - /* Chained lists of mdescs */ + /** @brief Chained lists of mdescs */ struct mdesc *next_mdesc; - /* The "magic number" for an mmalloc file. */ + /** @brief The "magic number" for an mmalloc file. */ char magic[MMALLOC_MAGIC_SIZE]; - /* The size in bytes of this structure, used as a sanity check when reusing - a previously created mapped file. */ + /** @brief The size in bytes of this structure + * + * Used as a sanity check when reusing a previously created mapped file. + * */ unsigned int headersize; - /* The version number of the mmalloc package that created this file. */ + /** @brief Version number of the mmalloc package that created this file. */ unsigned char version; unsigned int options; - /* Some flag bits to keep track of various internal things. */ + /** @brief Some flag bits to keep track of various internal things. */ unsigned int flags; - /* Number of info entries. */ + /** @brief Number of info entries. */ size_t heapsize; - /* Pointer to first block of the heap (base of the first block). */ + /** @brief Pointer to first block of the heap (base of the first block). */ void *heapbase; - /* Current search index for the heap table. */ - /* Search index in the info table. */ + /** @brief Current search index for the heap table. + * + * Search index in the info table. + */ size_t heapindex; - /* Limit of valid info table indices. */ + /** @brief Limit of valid info table indices. */ size_t heaplimit; - /* Block information table. - Allocated with malign/mfree (not mmalloc/mfree). */ - /* Table indexed by block number giving per-block information. */ + /** @brief Block information table. + * + * Table indexed by block number giving per-block information. + */ malloc_info *heapinfo; - /* List of all blocks containing free fragments of this size. + /* @brief List of all blocks containing free fragments of a given size. + * * The array indice 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]; - /* The base address of the memory region for this malloc heap. This - is the location where the bookkeeping data for mmap and for malloc - begins. */ - + /* @brief Base address of the memory region for this malloc heap + * + * This is the location where the bookkeeping data for mmap and + * for malloc begins. + */ void *base; - /* The current location in the memory region for this malloc heap which - represents the end of memory in use. */ - + /** @brief End of memory in use + * + * Some memory might be already mapped by the OS but not used + * by the heap. + * */ void *breakval; - /* The end of the current memory region for this malloc heap. This is - the first location past the end of mapped memory. - Compared to breakval, this value is rounded to the next memory page. - */ - + /** @brief End of the current memory region for this malloc heap. + * + * This is the first location past the end of mapped memory. + * + * Compared to breakval, this value is rounded to the next memory page. + */ void *top; - /* Open file descriptor for the file to which this malloc heap is mapped. - This will always be a valid file descriptor, since /dev/zero is used - by default if no open file is supplied by the client. Also note that - it may change each time the region is mapped and unmapped. */ - + /** @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; - /* Instrumentation. */ - + /* @brief Instrumentation */ struct mstats heapstats; }; @@ -269,30 +284,27 @@ struct mdesc { /* A default malloc descriptor for the single sbrk() managed region. */ -XBT_PUBLIC( struct mdesc ) *__mmalloc_default_mdp; +XBT_PUBLIC_DATA struct mdesc* __mmalloc_default_mdp; /* Remap a mmalloc region that was previously mapped. */ -XBT_PUBLIC( void *)__mmalloc_remap_core(xbt_mheap_t mdp); +XBT_PUBLIC void* __mmalloc_remap_core(xbt_mheap_t mdp); -/* Get core for the memory region specified by MDP, using SIZE as the - amount to either add to or subtract from the existing region. Works - like sbrk(), but using mmap(). */ -XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size); +XBT_PUBLIC void* mmorecore(struct mdesc* mdp, ssize_t size); -/* Thread-safety (if the sem is already created) +/** Thread-safety (if the mutex is already created) * * This is mandatory in the case where the user runs a parallel simulation * in a model-checking enabled tree. Without this protection, our malloc * implementation will not like multi-threading AT ALL. */ -#define LOCK(mdp) sem_wait(&mdp->sem) -#define UNLOCK(mdp) sem_post(&mdp->sem) +#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){ +XBT_PRIVATE int malloc_use_mmalloc(void); - /* nothing to fear for no */ +XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); -} +SG_END_DECL() -#endif /* __MMPRIVATE_H */ +#endif