Index: libcfa/src/heap.cfa =================================================================== --- libcfa/src/heap.cfa (revision be91ab4b15c324cf50bb6e2b5831a7f08d33c07c) +++ libcfa/src/heap.cfa (revision 1076d05688c3384e8cffb420e43cc293bc3d3d7c) @@ -10,6 +10,6 @@ // Created On : Tue Dec 19 21:58:35 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Apr 18 17:43:15 2020 -// Update Count : 718 +// Last Modified On : Wed May 6 17:29:26 2020 +// Update Count : 727 // @@ -19,9 +19,9 @@ #include // errno #include // memset, memcpy +#include // ULONG_MAX extern "C" { #include // mmap, munmap } // extern "C" -// #comment TD : Many of these should be merged into math I believe #include "bits/align.hfa" // libPow2 #include "bits/defs.hfa" // likely, unlikely @@ -30,4 +30,5 @@ //#include "stdlib.hfa" // bsearchl #include "malloc.h" +#include "bitmanip.hfa" // ceiling #define MIN(x, y) (y > x ? x : y) @@ -81,11 +82,11 @@ }; +size_t default_heap_expansion() __attribute__(( weak )) { + return __CFA_DEFAULT_HEAP_EXPANSION__; +} // default_heap_expansion + size_t default_mmap_start() __attribute__(( weak )) { return __CFA_DEFAULT_MMAP_START__; } // default_mmap_start - -size_t default_heap_expansion() __attribute__(( weak )) { - return __CFA_DEFAULT_HEAP_EXPANSION__; -} // default_heap_expansion @@ -360,11 +361,4 @@ -static inline bool setHeapExpand( size_t value ) { - if ( heapExpand < pageSize ) return true; - heapExpand = value; - return false; -} // setHeapExpand - - // thunk problem size_t Bsearchl( unsigned int key, const unsigned int * vals, size_t dim ) { @@ -383,5 +377,5 @@ static inline bool setMmapStart( size_t value ) { // true => mmapped, false => sbrk - if ( value < pageSize || bucketSizes[NoBucketSizes - 1] < value ) return true; + if ( value < pageSize || bucketSizes[NoBucketSizes - 1] < value ) return false; mmapStart = value; // set global @@ -390,5 +384,5 @@ assert( maxBucketsUsed < NoBucketSizes ); // subscript failure ? assert( mmapStart <= bucketSizes[maxBucketsUsed] ); // search failure ? - return false; + return true; } // setMmapStart @@ -449,5 +443,5 @@ #ifdef __CFA_DEBUG__ - checkHeader( addr < heapBegin || header < (HeapManager.Storage.Header *)heapBegin, name, addr ); // bad low address ? + checkHeader( addr < heapBegin, name, addr ); // bad low address ? #endif // __CFA_DEBUG__ @@ -508,5 +502,5 @@ // along with the block and is a multiple of the alignment size. - if ( unlikely( size > ~0ul - sizeof(HeapManager.Storage) ) ) return 0p; + if ( unlikely( size > ULONG_MAX - sizeof(HeapManager.Storage) ) ) return 0p; size_t tsize = size + sizeof(HeapManager.Storage); if ( likely( tsize < mmapStart ) ) { // small size => sbrk @@ -560,5 +554,5 @@ block->header.kind.real.home = freeElem; // pointer back to free list of apropriate size } else { // large size => mmap - if ( unlikely( size > ~0ul - pageSize ) ) return 0p; + if ( unlikely( size > ULONG_MAX - pageSize ) ) return 0p; tsize = libCeiling( tsize, pageSize ); // must be multiple of page size #ifdef __STATISTICS__ @@ -702,5 +696,5 @@ #endif // FASTLOOKUP - if ( setMmapStart( default_mmap_start() ) ) { + if ( ! setMmapStart( default_mmap_start() ) ) { abort( "HeapManager : internal error, mmap start initialization failure." ); } // if @@ -708,6 +702,5 @@ char * end = (char *)sbrk( 0 ); - sbrk( (char *)libCeiling( (long unsigned int)end, libAlign() ) - end ); // move start of heap to multiple of alignment - heapBegin = heapEnd = sbrk( 0 ); // get new start point + heapBegin = heapEnd = sbrk( (char *)libCeiling( (long unsigned int)end, libAlign() ) - end ); // move start of heap to multiple of alignment } // HeapManager @@ -735,5 +728,5 @@ //assert( heapManager.heapBegin != 0 ); //heapManager{}; - if ( heapManager.heapBegin == 0p ) heapManager{}; + if ( heapManager.heapBegin == 0p ) heapManager{}; // sanity check } // memory_startup @@ -863,15 +856,5 @@ #endif // __STATISTICS__ - size_t size = dim * elemSize; - char * addr = (char *)mallocNoStats( size ); - if ( unlikely( addr == 0p ) ) return 0p; - - HeapManager.Storage.Header * header; - HeapManager.FreeHeader * freeElem; - size_t bsize, alignment; - headers( "aalloc", addr, header, freeElem, bsize, alignment ); - - header->kind.real.blockSize |= 2; // mark as zero filled - return addr; + return mallocNoStats( dim * elemSize ); } // aalloc @@ -914,6 +897,6 @@ // change size, DO NOT preserve STICKY PROPERTIES. + free( oaddr ); void * naddr = mallocNoStats( size ); // create new area - free( oaddr ); return naddr; } // resize @@ -988,14 +971,5 @@ #endif // __STATISTICS__ - size_t size = dim * elemSize; - char * addr = (char *)memalignNoStats( alignment, size ); - if ( unlikely( addr == 0p ) ) return 0p; - HeapManager.Storage.Header * header; - HeapManager.FreeHeader * freeElem; - size_t bsize; - headers( "amemalign", addr, header, freeElem, bsize, alignment ); - - header->kind.real.blockSize |= 2; // mark as zero filled - return addr; + return memalignNoStats( alignment, dim * elemSize ); } // amemalign @@ -1043,5 +1017,5 @@ // Frees the memory space pointed to by ptr, which must have been returned by a previous call to malloc(), calloc() - // or realloc(). Otherwise, or if free(ptr) has already been called before, undefined behavior occurs. If ptr is + // or realloc(). Otherwise, or if free(ptr) has already been called before, undefined behaviour occurs. If ptr is // 0p, no operation is performed. void free( void * addr ) { @@ -1170,12 +1144,13 @@ - // Adjusts parameters that control the behavior of the memory-allocation functions (see malloc). The param argument + // Adjusts parameters that control the behaviour of the memory-allocation functions (see malloc). The param argument // specifies the parameter to be modified, and value specifies the new value for that parameter. int mallopt( int option, int value ) { choose( option ) { case M_TOP_PAD: - if ( setHeapExpand( value ) ) return 1; + heapExpand = ceiling( value, pageSize ); return 1; case M_MMAP_THRESHOLD: if ( setMmapStart( value ) ) return 1; + break; } // switch return 0; // error, unsupported