Index: libcfa/src/heap.cfa =================================================================== --- libcfa/src/heap.cfa (revision 5dc5da7a7221403820e332305ade84ac3af8a274) +++ libcfa/src/heap.cfa (revision ad2dced5ee5fca6b3946b3448926eee5730dda59) @@ -10,9 +10,10 @@ // Created On : Tue Dec 19 21:58:35 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Dec 13 22:04:10 2020 -// Update Count : 984 +// Last Modified On : Tue Dec 15 21:37:54 2020 +// Update Count : 1013 // #include // sbrk, sysconf +#include // EXIT_FAILURE #include // true, false #include // snprintf, fileno @@ -71,5 +72,5 @@ // Define the default extension heap amount in units of bytes. When the uC++ supplied heap reaches the brk address, // the brk address is extended by the extension amount. - __CFA_DEFAULT_HEAP_EXPANSION__ = (1 * 1024 * 1024), + __CFA_DEFAULT_HEAP_EXPANSION__ = (10 * 1024 * 1024), // Define the mmap crossover point during allocation. Allocations less than this amount are allocated from buckets; @@ -115,5 +116,6 @@ // statically allocated variables => zero filled. -static size_t pageSize; // architecture pagesize +size_t __page_size; // architecture pagesize +int __map_prot; // common mmap/mprotect protection static size_t heapExpand; // sbrk advance static size_t mmapStart; // cross over point for mmap @@ -249,5 +251,5 @@ #endif // FASTLOOKUP -static int mmapFd = -1; // fake or actual fd for anonymous file +static const off_t mmapFd = -1; // fake or actual fd for anonymous file #ifdef __CFA_DEBUG__ static bool heapBoot = 0; // detect recursion during boot @@ -374,5 +376,5 @@ static inline bool setMmapStart( size_t value ) { // true => mmapped, false => sbrk - if ( value < pageSize || bucketSizes[NoBucketSizes - 1] < value ) return false; + if ( value < __page_size || bucketSizes[NoBucketSizes - 1] < value ) return false; mmapStart = value; // set global @@ -484,4 +486,5 @@ #define NO_MEMORY_MSG "insufficient heap memory available for allocating %zd new bytes." +#include static inline void * extend( size_t size ) with( heapManager ) { lock( extlock __cfaabi_dbg_ctx2 ); @@ -490,15 +493,15 @@ // If the size requested is bigger than the current remaining storage, increase the size of the heap. - size_t increase = ceiling2( size > heapExpand ? size : heapExpand, pageSize ); + size_t increase = ceiling2( size > heapExpand ? size : heapExpand, __page_size ); + // Do not call abort or strerror( errno ) as they may call malloc. if ( sbrk( increase ) == (void *)-1 ) { // failed, no memory ? unlock( extlock ); - abort( NO_MEMORY_MSG, size ); // give up - } // if - if ( mprotect( (char *)heapEnd + heapRemaining, increase, PROT_READ | PROT_WRITE | PROT_EXEC ) ) { - enum { BufferSize = 128 }; - char helpText[BufferSize]; - // Do not call strerror( errno ) as it may call malloc. - int len = snprintf( helpText, BufferSize, "internal error, extend(), mprotect failure, heapEnd:%p size:%zd, errno:%d.", heapEnd, increase, errno ); - __cfaabi_bits_write( STDERR_FILENO, helpText, len ); + __cfaabi_bits_print_nolock( STDERR_FILENO, NO_MEMORY_MSG, size ); + _exit( EXIT_FAILURE ); + } // if + if ( mprotect( (char *)heapEnd + heapRemaining, increase, __map_prot ) ) { + unlock( extlock ); + __cfaabi_bits_print_nolock( STDERR_FILENO, "extend() : internal error, mprotect failure, heapEnd:%p size:%zd, errno:%d.\n", heapEnd, increase, errno ); + _exit( EXIT_FAILURE ); } // if #ifdef __STATISTICS__ @@ -508,6 +511,6 @@ #ifdef __CFA_DEBUG__ // Set new memory to garbage so subsequent uninitialized usages might fail. - //memset( (char *)heapEnd + heapRemaining, '\377', increase ); - Memset( (char *)heapEnd + heapRemaining, increase ); + memset( (char *)heapEnd + heapRemaining, '\hde', increase ); + //Memset( (char *)heapEnd + heapRemaining, increase ); #endif // __CFA_DEBUG__ rem = heapRemaining + increase - size; @@ -568,6 +571,6 @@ block->header.kind.real.home = freeElem; // pointer back to free list of apropriate size } else { // large size => mmap - if ( unlikely( size > ULONG_MAX - pageSize ) ) return 0p; - tsize = ceiling2( tsize, pageSize ); // must be multiple of page size + if ( unlikely( size > ULONG_MAX - __page_size ) ) return 0p; + tsize = ceiling2( tsize, __page_size ); // must be multiple of page size #ifdef __STATISTICS__ __atomic_add_fetch( &mmap_calls, 1, __ATOMIC_SEQ_CST ); @@ -575,5 +578,5 @@ #endif // __STATISTICS__ - block = (HeapManager.Storage *)mmap( 0, tsize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, mmapFd, 0 ); + block = (HeapManager.Storage *)mmap( 0, tsize, __map_prot, MAP_PRIVATE | MAP_ANONYMOUS, mmapFd, 0 ); if ( block == (HeapManager.Storage *)MAP_FAILED ) { // failed ? if ( errno == ENOMEM ) abort( NO_MEMORY_MSG, tsize ); // no memory @@ -583,6 +586,6 @@ #ifdef __CFA_DEBUG__ // Set new memory to garbage so subsequent uninitialized usages might fail. - //memset( block, '\377', tsize ); - Memset( block, tsize ); + memset( block, '\hde', tsize ); + //Memset( block, tsize ); #endif // __CFA_DEBUG__ block->header.kind.real.blockSize = tsize; // storage size for munmap @@ -624,15 +627,13 @@ #endif // __STATISTICS__ if ( munmap( header, size ) == -1 ) { - #ifdef __CFA_DEBUG__ abort( "Attempt to deallocate storage %p not allocated or with corrupt header.\n" "Possible cause is invalid pointer.", addr ); - #endif // __CFA_DEBUG__ } // if } else { #ifdef __CFA_DEBUG__ // Set free memory to garbage so subsequent usages might fail. - //memset( ((HeapManager.Storage *)header)->data, '\377', freeElem->blockSize - sizeof( HeapManager.Storage ) ); - Memset( ((HeapManager.Storage *)header)->data, freeElem->blockSize - sizeof( HeapManager.Storage ) ); + memset( ((HeapManager.Storage *)header)->data, '\hde', freeElem->blockSize - sizeof( HeapManager.Storage ) ); + //Memset( ((HeapManager.Storage *)header)->data, freeElem->blockSize - sizeof( HeapManager.Storage ) ); #endif // __CFA_DEBUG__ @@ -703,5 +704,6 @@ static void ?{}( HeapManager & manager ) with( manager ) { - pageSize = sysconf( _SC_PAGESIZE ); + __page_size = sysconf( _SC_PAGESIZE ); + __map_prot = PROT_READ | PROT_WRITE | PROT_EXEC; for ( unsigned int i = 0; i < NoBucketSizes; i += 1 ) { // initialize the free lists @@ -723,5 +725,5 @@ char * end = (char *)sbrk( 0 ); - heapBegin = heapEnd = sbrk( (char *)ceiling2( (long unsigned int)end, pageSize ) - end ); // move start of heap to multiple of alignment + heapBegin = heapEnd = sbrk( (char *)ceiling2( (long unsigned int)end, __page_size ) - end ); // move start of heap to multiple of alignment } // HeapManager @@ -741,5 +743,4 @@ #ifdef __CFA_DEBUG__ if ( heapBoot ) { // check for recursion during system boot - // DO NOT USE STREAMS AS THEY MAY BE UNAVAILABLE AT THIS POINT. abort( "boot() : internal error, recursively invoked during system boot." ); } // if @@ -1048,5 +1049,5 @@ // page size. It is equivalent to memalign(sysconf(_SC_PAGESIZE),size). void * valloc( size_t size ) { - return memalign( pageSize, size ); + return memalign( __page_size, size ); } // valloc @@ -1054,5 +1055,5 @@ // Same as valloc but rounds size to multiple of page size. void * pvalloc( size_t size ) { - return memalign( pageSize, ceiling2( size, pageSize ) ); + return memalign( __page_size, ceiling2( size, __page_size ) ); } // pvalloc @@ -1193,5 +1194,5 @@ choose( option ) { case M_TOP_PAD: - heapExpand = ceiling2( value, pageSize ); return 1; + heapExpand = ceiling2( value, __page_size ); return 1; case M_MMAP_THRESHOLD: if ( setMmapStart( value ) ) return 1;