X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00255adf47970918999b2b4495ce8a69b036e68a..08d324beef1e0fa723013987a98ed7740d2f8343:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index 8352e13379..ccc667dc8f 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -18,6 +18,7 @@ #include "xbt/mmalloc.h" #include "xbt/ex.h" #include +#include #ifdef HAVE_LIMITS_H # include @@ -27,20 +28,34 @@ # endif #endif -#define MMALLOC_MAGIC "mmalloc" /* Mapped file magic number */ -#define MMALLOC_MAGIC_SIZE 8 /* Size of magic number buf */ -#define MMALLOC_VERSION 1 /* Current mmalloc version */ +#define MMALLOC_MAGIC "mmalloc" /* Mapped file magic number */ +#define MMALLOC_MAGIC_SIZE 8 /* Size of magic number buf */ +#define MMALLOC_VERSION 2 /* Current mmalloc version */ /* The allocator divides the heap into blocks of fixed size; large requests receive one or more whole blocks, and small requests receive a fragment of a block. Fragment sizes are powers of two, and all fragments of a block are the same size. When all the - fragments in a block have been freed, the block itself is freed. */ + fragments in a block have been freed, the block itself is freed. -#define INT_BIT (CHAR_BIT * sizeof(int)) -#define BLOCKLOG (INT_BIT > 16 ? 12 : 9) -#define BLOCKSIZE ((unsigned int) 1 << BLOCKLOG) -#define BLOCKIFY(SIZE) (((SIZE) + BLOCKSIZE - 1) / BLOCKSIZE) + FIXME: we are not targeting 16bits machines anymore; update values */ + +#define INT_BIT (CHAR_BIT * sizeof(int)) +#define BLOCKLOG (INT_BIT > 16 ? 12 : 9) +#define BLOCKSIZE ((unsigned int) 1 << BLOCKLOG) +#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 + * 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) /* The difference between two pointers is a signed int. On machines where the data addresses have the high bit set, we need to ensure that the @@ -49,25 +64,25 @@ sign of the result is machine dependent for negative values, so force it to be treated as an unsigned int. */ -#define ADDR2UINT(addr) ((unsigned int) ((char*) (addr) - (char*) NULL)) -#define RESIDUAL(addr,bsize) ((unsigned int) (ADDR2UINT (addr) % (bsize))) +#define ADDR2UINT(addr) ((uintptr_t) ((char*) (addr) - (char*) NULL)) +#define RESIDUAL(addr,bsize) ((uintptr_t) (ADDR2UINT (addr) % (bsize))) /* Determine the amount of memory spanned by the initial heap table (not an absolute limit). */ -#define HEAP (INT_BIT > 16 ? 4194304 : 65536) +#define HEAP (INT_BIT > 16 ? 4194304 : 65536) /* Number of contiguous free blocks allowed to build up at the end of - memory before they will be returned to the system. */ - -#define FINAL_FREE_BLOCKS 8 + memory before they will be returned to the system. + FIXME: this is not used anymore: we never return memory to the system. */ +#define FINAL_FREE_BLOCKS 8 /* Where to start searching the free list when looking for new memory. The two possible values are 0 and heapindex. Starting at 0 seems to reduce total memory usage, while starting at heapindex seems to run faster. */ -#define MALLOC_SEARCH_START mdp -> heapindex +#define MALLOC_SEARCH_START mdp -> heapindex /* Address to block number and vice versa. */ @@ -75,12 +90,26 @@ #define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase)) -const char *xbt_thread_self_name(void); +/* Doubly linked lists of free fragments. */ +struct list { + struct list *next; + struct list *prev; +}; + +/* Statistics available to the user. */ +struct mstats +{ + size_t bytes_total; /* Total size of the heap. */ + size_t chunks_used; /* Chunks allocated by the user. */ + size_t bytes_used; /* Byte total of user-allocated chunks. */ + size_t chunks_free; /* Chunks in the free list. */ + size_t bytes_free; /* Byte total of chunks in the free list. */ +}; /* Data structure giving per-block information. * - * There is one such structure in the mdp->heapinfo array, - * that is addressed by block number. + * There is one such structure in the mdp->heapinfo array per block used in that heap, + * the array index is the block number. * * There is several types of blocks in memory: * - full busy blocks: used when we are asked to malloc a block which size is > BLOCKSIZE/2 @@ -95,51 +124,41 @@ const char *xbt_thread_self_name(void); * When looking for free blocks, we traverse the mdp->heapinfo looking * for a cluster of free blocks that would be large enough. * - * The size of the cluster is only to be trusted in the first block of the cluster. - * If the cluster results of the fusion of several clusters, the previously first - * block of their cluster will have partial data. The only information kept consistent over - * all blocks of the clusters is their type (== -1). + * The size of the cluster is only to be trusted in the first block of the cluster, not in the middle blocks. * - * Note that there is no way to determine if the block is free or busy by exploring - * this structure only. It wasn't intended to be crawled for comparison and we should fix it (TODO). - * - * TODO: understand whether the information are written in each blocks of a cluster (be it - * free or busy) or only in the first block of the cluster. And in the latter case, how can - * I retrieve the first block of my cluster. + * The type field is consistently updated for every blocks, even within clusters of blocks. + * You can crawl the array and rely on that value. * * TODO: - * - add an indication of the requested size in each fragment, similarly to busy_block.busy_size * - make room to store the backtrace of where the blocks and fragment were malloced, too. */ 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. */ - size_t first; /* First free fragment of the block. */ - } busy_frag; - struct { - size_t size; /* Size (in blocks) of a large cluster. */ - size_t busy_size; /* Actually used space, in bytes */ - } busy_block; - /* Heap information for a free block (that may be the first of a free cluster). */ - struct { - size_t size; /* Size (in blocks) of a free cluster. */ - size_t next; /* Index of next free cluster. */ - size_t prev; /* Index of previous free cluster. */ - } free_block; - }; + 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. */ + size_t first; /* First free fragment of the block. */ + unsigned short frag_size[MAX_FRAGMENT_PER_BLOCK]; + void *bt[MAX_FRAGMENT_PER_BLOCK][XBT_BACKTRACE_SIZE]; /* Where it was malloced (or realloced lastly) */ + } 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; + } busy_block; + /* Heap information for a free block (that may be the first of a free cluster). */ + struct { + size_t size; /* Size (in blocks) of a free cluster. */ + size_t next; /* Index of next free cluster. */ + size_t prev; /* Index of previous free cluster. */ + } free_block; + }; } malloc_info; -/* Doubly linked lists of free fragments. */ -struct list { - struct list *next; - struct list *prev; -}; - /* 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, @@ -147,83 +166,89 @@ struct list { struct mdesc { - /* Semaphore locking the access to the heap */ - sem_t sem; + /* Semaphore locking the access to the heap */ + sem_t sem; - /* Number of processes that attached the heap */ - unsigned int refcount; + /* Number of processes that attached the heap */ + unsigned int refcount; - /* Chained lists of mdescs */ - struct mdesc *next_mdesc; + /* Chained lists of mdescs */ + struct mdesc *next_mdesc; - /* The "magic number" for an mmalloc file. */ - char magic[MMALLOC_MAGIC_SIZE]; + /* 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 + /* The size in bytes of this structure, used as a sanity check when reusing a previously created mapped file. */ - unsigned int headersize; + unsigned int headersize; - /* The version number of the mmalloc package that created this file. */ - unsigned char version; + /* The version number of the mmalloc package that created this file. */ + unsigned char version; - /* Some flag bits to keep track of various internal things. */ - unsigned int flags; + /* Some flag bits to keep track of various internal things. */ + unsigned int flags; - /* Number of info entries. */ - size_t heapsize; + /* Number of info entries. */ + size_t heapsize; - /* Pointer to first block of the heap (base of the first block). */ - void *heapbase; + /* 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. */ - size_t heapindex; + /* Current search index for the heap table. */ + /* Search index in the info table. */ + size_t heapindex; - /* Limit of valid info table indices. */ - size_t heaplimit; + /* Limit of valid info table indices. */ + size_t heaplimit; - /* Block information table. + /* Block information table. Allocated with malign/mfree (not mmalloc/mfree). */ - /* Table indexed by block number giving per-block information. */ - malloc_info *heapinfo; + /* Table indexed by block number giving per-block information. */ + malloc_info *heapinfo; - /* List of all blocks containing free fragments of this size. The array indice is the log2 of requested size */ - struct list fraghead[BLOCKLOG]; + /* List of all blocks containing free fragments of this size. The array indice is the log2 of requested size */ + struct list fraghead[BLOCKLOG]; - /* The base address of the memory region for this malloc heap. This + /* 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. */ - void *base; + void *base; - /* The current location in the memory region for this malloc heap which + /* The current location in the memory region for this malloc heap which represents the end of memory in use. */ - void *breakval; + void *breakval; - /* The end of the current memory region for this malloc heap. This is + /* The end of the current memory region for this malloc heap. This is the first location past the end of mapped memory. */ - void *top; + void *top; - /* Open file descriptor for the file to which this malloc heap is mapped. + /* 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. */ - int fd; + int fd; + + /* Instrumentation. */ + + struct mstats heapstats; }; -int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr); +int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2); void mmalloc_display_info(void *h); +//void *get_end_addr_heap(void *s_heap); + /* Bits to look at in the malloc descriptor flags word */ -#define MMALLOC_DEVZERO (1 << 0) /* Have mapped to /dev/zero */ +#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 << 2) /* Initialized mmalloc */ /* A default malloc descriptor for the single sbrk() managed region. */ @@ -238,11 +263,13 @@ extern void *__mmalloc_remap_core(xbt_mheap_t mdp); like sbrk(), but using mmap(). */ extern void *mmorecore(struct mdesc *mdp, int size); -/* Thread-safety (if the sem is already created) FIXME: KILLIT*/ -#define LOCK(mdp) \ - sem_wait(&mdp->sem) - -#define UNLOCK(mdp) \ - sem_post(&mdp->sem) +/* Thread-safety (if the sem 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) #endif /* __MMPRIVATE_H */