Changeset 7b3a6e6 for libcfa/src/heap.cfa
- Timestamp:
- Aug 14, 2018, 1:21:19 PM (6 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
- Children:
- 5a5d31a
- Parents:
- ef2eade (diff), 0e0f128c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - File:
-
- 1 edited
-
libcfa/src/heap.cfa (modified) (21 diffs)
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/heap.cfa
ref2eade r7b3a6e6 10 10 // Created On : Tue Dec 19 21:58:35 2017 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Tue Jul 31 18:08:50201813 // Update Count : 4 7012 // Last Modified On : Sat Aug 11 08:22:16 2018 13 // Update Count : 495 14 14 // 15 15 … … 75 75 76 76 77 static _Bool traceHeap = false;78 79 inline _Bool traceHeap() {77 static bool traceHeap = false; 78 79 inline bool traceHeap() { 80 80 return traceHeap; 81 81 } // traceHeap 82 82 83 _Bool traceHeapOn() {84 _Bool temp = traceHeap;83 bool traceHeapOn() { 84 bool temp = traceHeap; 85 85 traceHeap = true; 86 86 return temp; 87 87 } // traceHeapOn 88 88 89 _Bool traceHeapOff() {90 _Bool temp = traceHeap;89 bool traceHeapOff() { 90 bool temp = traceHeap; 91 91 traceHeap = false; 92 92 return temp; … … 94 94 95 95 96 static _Bool checkFree = false;97 98 inline _Bool checkFree() {96 static bool checkFree = false; 97 98 inline bool checkFree() { 99 99 return checkFree; 100 100 } // checkFree 101 101 102 _Bool checkFreeOn() {103 _Bool temp = checkFree;102 bool checkFreeOn() { 103 bool temp = checkFree; 104 104 checkFree = true; 105 105 return temp; 106 106 } // checkFreeOn 107 107 108 _Bool checkFreeOff() {109 _Bool temp = checkFree;108 bool checkFreeOff() { 109 bool temp = checkFree; 110 110 checkFree = false; 111 111 return temp; … … 113 113 114 114 115 // static _Bool traceHeapTerm = false;116 117 // inline _Bool traceHeapTerm() {115 // static bool traceHeapTerm = false; 116 117 // inline bool traceHeapTerm() { 118 118 // return traceHeapTerm; 119 119 // } // traceHeapTerm 120 120 121 // _Bool traceHeapTermOn() {122 // _Bool temp = traceHeapTerm;121 // bool traceHeapTermOn() { 122 // bool temp = traceHeapTerm; 123 123 // traceHeapTerm = true; 124 124 // return temp; 125 125 // } // traceHeapTermOn 126 126 127 // _Bool traceHeapTermOff() {128 // _Bool temp = traceHeapTerm;127 // bool traceHeapTermOff() { 128 // bool temp = traceHeapTerm; 129 129 // traceHeapTerm = false; 130 130 // return temp; … … 133 133 134 134 #ifdef __CFA_DEBUG__ 135 static unsigned int allocfree; // running total of allocations minus frees 136 static unsigned int appStart; // storage allocation when application starts 135 static unsigned int allocFree; // running total of allocations minus frees 137 136 138 137 static void checkUnfreed() { 139 unsigned int total = allocfree - appStart; 140 if ( total != 0 ) { 138 if ( allocFree != 0 ) { 141 139 // DO NOT USE STREAMS AS THEY MAY BE UNAVAILABLE AT THIS POINT. 142 140 // char helpText[512]; 143 // int len = snprintf( helpText, 512, "CFA warning (UNIX pid:%ld) : program terminating with %u(0x%x) bytes of storage allocated but not freed.\n"141 // int len = snprintf( helpText, sizeof(helpText), "CFA warning (UNIX pid:%ld) : program terminating with %u(0x%x) bytes of storage allocated but not freed.\n" 144 142 // "Possible cause is unfreed storage allocated by the program or system/library routines called from the program.\n", 145 // (long int)getpid(), total, total); // always print the UNIX pid143 // (long int)getpid(), allocFree, allocFree ); // always print the UNIX pid 146 144 // __cfaabi_dbg_bits_write( helpText, len ); 147 145 } // if … … 150 148 extern "C" { 151 149 void heapAppStart() { // called by __cfaabi_appready_startup 152 a ppStart = allocfree;150 allocFree = 0; 153 151 } // heapAppStart 154 152 155 153 void heapAppStop() { // called by __cfaabi_appready_startdown 154 fclose( stdin ); fclose( stdout ); 156 155 checkUnfreed(); 157 156 } // heapAppStop … … 191 190 #endif // LOCKFREE 192 191 }; 193 } real; 192 } real; // RealHeader 194 193 struct FakeHeader { 195 194 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ … … 202 201 uint32_t alignment; // low-order bits of home/blockSize used for tricks 203 202 #endif // __ORDER_BIG_ENDIAN__ 204 } fake; 205 } kind; 203 } fake; // FakeHeader 204 } kind; // Kind 206 205 } header; // Header 207 206 char pad[ALIGN - sizeof( Header )]; … … 264 263 265 264 #ifdef __CFA_DEBUG__ 266 static _Bool heapBoot = 0; // detect recursion during boot265 static bool heapBoot = 0; // detect recursion during boot 267 266 #endif // __CFA_DEBUG__ 268 267 static HeapManager heapManager __attribute__(( aligned (128) )) @= {}; // size of cache line to prevent false sharing 269 268 270 269 271 static inline _Bool setMmapStart( size_t value ) {270 static inline bool setMmapStart( size_t value ) { 272 271 if ( value < pageSize || bucketSizes[NoBucketSizes - 1] < value ) return true; 273 272 mmapStart = value; // set global … … 363 362 static void printStats() { 364 363 char helpText[512]; 365 __cfaabi_dbg_bits_print_buffer( helpText, 512,364 __cfaabi_dbg_bits_print_buffer( helpText, sizeof(helpText), 366 365 "\nHeap statistics:\n" 367 366 " malloc: calls %u / storage %llu\n" … … 389 388 static int printStatsXML( FILE * stream ) { 390 389 char helpText[512]; 391 int len = snprintf( helpText, 512,390 int len = snprintf( helpText, sizeof(helpText), 392 391 "<malloc version=\"1\">\n" 393 392 "<heap nr=\"0\">\n" … … 433 432 434 433 435 static inline _Bool setHeapExpand( size_t value ) {434 static inline bool setHeapExpand( size_t value ) { 436 435 if ( heapExpand < pageSize ) return true; 437 436 heapExpand = value; … … 440 439 441 440 442 static inline void checkHeader( _Bool check, const char * name, void * addr ) {441 static inline void checkHeader( bool check, const char * name, void * addr ) { 443 442 if ( unlikely( check ) ) { // bad address ? 444 443 abort( "Attempt to %s storage %p with address outside the heap.\n" … … 463 462 #define headerAddr( addr ) ((HeapManager.Storage.Header *)( (char *)addr - sizeof(HeapManager.Storage) )) 464 463 465 static inline _Bool headers( const char * name, void * addr, HeapManager.Storage.Header *& header, HeapManager.FreeHeader *& freeElem, size_t & size, size_t & alignment ) with ( heapManager ) {464 static inline bool headers( const char * name, void * addr, HeapManager.Storage.Header *& header, HeapManager.FreeHeader *& freeElem, size_t & size, size_t & alignment ) with ( heapManager ) { 466 465 header = headerAddr( addr ); 467 466 … … 589 588 #ifdef __CFA_DEBUG__ 590 589 assert( ((uintptr_t)area & (libAlign() - 1)) == 0 ); // minimum alignment ? 591 __atomic_add_fetch( &alloc free, tsize, __ATOMIC_SEQ_CST );590 __atomic_add_fetch( &allocFree, tsize, __ATOMIC_SEQ_CST ); 592 591 if ( traceHeap() ) { 593 592 enum { BufferSize = 64 }; … … 646 645 647 646 #ifdef __CFA_DEBUG__ 648 __atomic_add_fetch( &alloc free, -size, __ATOMIC_SEQ_CST );647 __atomic_add_fetch( &allocFree, -size, __ATOMIC_SEQ_CST ); 649 648 if ( traceHeap() ) { 650 enum { BufferSize = 64 }; 651 char helpText[BufferSize]; 652 int len = snprintf( helpText, BufferSize, "Free( %p ) size:%zu\n", addr, size ); 649 char helpText[64]; 650 int len = snprintf( helpText, sizeof(helpText), "Free( %p ) size:%zu\n", addr, size ); 653 651 __cfaabi_dbg_bits_write( helpText, len ); 654 652 } // if … … 758 756 HeapManager.FreeHeader * freeElem; 759 757 size_t asize, alignment; 760 _Bool mapped __attribute__(( unused )) = headers( "calloc", area, header, freeElem, asize, alignment );758 bool mapped __attribute__(( unused )) = headers( "calloc", area, header, freeElem, asize, alignment ); 761 759 #ifndef __CFA_DEBUG__ 762 760 // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero. … … 781 779 HeapManager.FreeHeader * freeElem; 782 780 size_t asize; 783 _Bool mapped __attribute__(( unused )) = headers( "cmemalign", area, header, freeElem, asize, alignment );781 bool mapped __attribute__(( unused )) = headers( "cmemalign", area, header, freeElem, asize, alignment ); 784 782 #ifndef __CFA_DEBUG__ 785 783 // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero. … … 826 824 if ( unlikely( header->kind.real.blockSize & 2 ) ) { // previous request zero fill (calloc/cmemalign) ? 827 825 assert( (header->kind.real.blockSize & 1) == 0 ); 828 _Bool mapped __attribute__(( unused )) = headers( "realloc", area, header, freeElem, asize, alignment );826 bool mapped __attribute__(( unused )) = headers( "realloc", area, header, freeElem, asize, alignment ); 829 827 #ifndef __CFA_DEBUG__ 830 828 // Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero. … … 889 887 } // free 890 888 889 891 890 int mallopt( int option, int value ) { 892 891 choose( option ) { … … 929 928 930 929 931 _Bool malloc_zero_fill( void * addr ) {930 bool malloc_zero_fill( void * addr ) { 932 931 if ( unlikely( addr == 0 ) ) return false; // null allocation is not zero fill 933 932 HeapManager.Storage.Header * header = (HeapManager.Storage.Header *)( (char *)addr - sizeof(HeapManager.Storage) );
Note: See TracChangeset
for help on using the changeset viewer.
