Changes in libcfa/src/heap.cfa [5951956:7671c6d]
- File:
-
- 1 edited
-
libcfa/src/heap.cfa (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/heap.cfa
r5951956 r7671c6d 10 10 // Created On : Tue Dec 19 21:58:35 2017 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Oct 13 21:41:32202213 // Update Count : 15 5312 // Last Modified On : Wed Oct 12 18:06:01 2022 13 // Update Count : 1528 14 14 // 15 15 … … 515 515 } // with 516 516 } // if 517 518 517 return heap; 519 518 } // getHeap … … 586 585 // allocUnfreed is set to 0 when a heap is created and it accumulates any unfreed storage during its multiple thread 587 586 // usages. At the end, add up each heap allocUnfreed value across all heaps to get the total unfreed storage. 588 int64_t allocUnfreed = 0;587 long long int allocUnfreed = 0; 589 588 for ( Heap * heap = heapMaster.heapManagersList; heap; heap = heap->nextHeapManager ) { 590 589 allocUnfreed += heap->allocUnfreed; … … 1043 1042 if ( errno == ENOMEM ) abort( NO_MEMORY_MSG, tsize ); // no memory 1044 1043 // Do not call strerror( errno ) as it may call malloc. 1045 abort( " **** Error ****attempt to allocate large object (> %zu) of size %zu bytes and mmap failed with errno %d.", size, heapMaster.mmapStart, errno );1044 abort( "attempt to allocate large object (> %zu) of size %zu bytes and mmap failed with errno %d.", size, heapMaster.mmapStart, errno ); 1046 1045 } // if 1047 1046 block->header.kind.real.blockSize = MarkMmappedBit( tsize ); // storage size for munmap … … 1107 1106 if ( unlikely( munmap( header, size ) == -1 ) ) { 1108 1107 // Do not call strerror( errno ) as it may call malloc. 1109 abort( " **** Error ****attempt to deallocate large object %p and munmap failed with errno %d.\n"1108 abort( "attempt to deallocate large object %p and munmap failed with errno %d.\n" 1110 1109 "Possible cause is invalid delete pointer: either not allocated or with corrupt header.", 1111 1110 addr, errno ); … … 1217 1216 1218 1217 #ifdef __STATISTICS__ 1219 static void incCalls( intptr_t statName ) libcfa_nopreempt {1218 static void incCalls( long int statName ) libcfa_nopreempt { 1220 1219 heapManager->stats.counters[statName].calls += 1; 1221 1220 } // incCalls 1222 1221 1223 static void incZeroCalls( intptr_t statName ) libcfa_nopreempt {1222 static void incZeroCalls( long int statName ) libcfa_nopreempt { 1224 1223 heapManager->stats.counters[statName].calls_0 += 1; 1225 1224 } // incZeroCalls … … 1227 1226 1228 1227 #ifdef __CFA_DEBUG__ 1229 static void incUnfreed( intptr_t offset ) libcfa_nopreempt {1228 static void incUnfreed( size_t offset ) libcfa_nopreempt { 1230 1229 heapManager->allocUnfreed += offset; 1231 1230 } // incUnfreed … … 1568 1567 if ( write( STDERR_FILENO, MALLOC_STATS_MSG, sizeof( MALLOC_STATS_MSG ) - 1 /* size includes '\0' */ ) == -1 ) { 1569 1568 #endif // __STATISTICS__ 1570 abort( " **** Error ****write failed in malloc_stats" );1569 abort( "write failed in malloc_stats" ); 1571 1570 } // if 1572 1571 } // malloc_stats
Note:
See TracChangeset
for help on using the changeset viewer.