X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb3be59d63b0d199fa3f32b5a22553e44cfb917a..3b83099adfbb07a89843ad15c9c1b8f8a62c4893:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index 62df14dd4d..dd3856abbd 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,15 +1,16 @@ -/* Declarations for `mmalloc' and friends. - Copyright 1990, 1991, 1992 Free Software Foundation +/* Declarations for `mmalloc' and friends. */ - Written May 1989 by Mike Haertel. - Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */ - -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2014. 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. */ +/* Copyright 1990, 1991, 1992 Free Software Foundation + + Written May 1989 by Mike Haertel. + Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */ + #ifndef __MMPRIVATE_H #define __MMPRIVATE_H 1 @@ -17,7 +18,10 @@ #include "xbt/xbt_os_thread.h" #include "xbt/mmalloc.h" #include "xbt/ex.h" +#include "xbt/dynar.h" +#include "xbt/swag.h" #include +#include #ifdef HAVE_LIMITS_H # include @@ -27,9 +31,9 @@ # endif #endif -#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 */ +#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 @@ -39,10 +43,10 @@ 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) +#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 @@ -52,7 +56,8 @@ * need to enlist the free fragments. */ -#define SMALLEST_POSSIBLE_MALLOC (sizeof(struct list)) +//#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 @@ -62,25 +67,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. FIXME: this is not used anymore: we never return memory to the system. */ -#define FINAL_FREE_BLOCKS 8 +#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. */ @@ -90,10 +95,33 @@ /* Doubly linked lists of free fragments. */ struct list { - struct list *next; - struct list *prev; + 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. */ }; +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; + /* Data structure giving per-block information. * * There is one such structure in the mdp->heapinfo array per block used in that heap, @@ -117,34 +145,35 @@ struct list { * 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: - * - 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. */ - unsigned short frag_size[MAX_FRAGMENT_PER_BLOCK]; - //void *bt[XBT_BACKTRACE_SIZE][MAX_FRAGMENT_PER_BLOCK]; /* 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; - }; + s_xbt_swag_hookup_t freehook; /* to register this block as having empty frags when needed */ + 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). */ + 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; /* Internal structure that defines the format of the malloc-descriptor. @@ -154,96 +183,100 @@ typedef struct { 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. + * 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 + /* 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 first location past the end of mapped memory. */ + /* 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. + */ - 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. */ -int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2); + struct mstats heapstats; -void mmalloc_display_info(void *h); +}; /* 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. */ -extern struct mdesc *__mmalloc_default_mdp; +XBT_PUBLIC( struct mdesc ) *__mmalloc_default_mdp; /* Remap a mmalloc region that was previously mapped. */ -extern 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(). */ -extern void *mmorecore(struct mdesc *mdp, int size); +XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size); /* Thread-safety (if the sem is already created) * @@ -254,4 +287,10 @@ extern void *mmorecore(struct mdesc *mdp, int size); #define LOCK(mdp) sem_wait(&mdp->sem) #define UNLOCK(mdp) sem_post(&mdp->sem) +static XBT_INLINE void mmalloc_paranoia(struct mdesc *mdp){ + + /* nothing to fear for no */ + +} + #endif /* __MMPRIVATE_H */