Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/heap.cfa

    r5951956 r7671c6d  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Oct 13 21:41:32 2022
    13 // Update Count     : 1553
     12// Last Modified On : Wed Oct 12 18:06:01 2022
     13// Update Count     : 1528
    1414//
    1515
     
    515515                } // with
    516516        } // if
    517 
    518517        return heap;
    519518} // getHeap
     
    586585                // allocUnfreed is set to 0 when a heap is created and it accumulates any unfreed storage during its multiple thread
    587586                // 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;
    589588                for ( Heap * heap = heapMaster.heapManagersList; heap; heap = heap->nextHeapManager ) {
    590589                        allocUnfreed += heap->allocUnfreed;
     
    10431042                        if ( errno == ENOMEM ) abort( NO_MEMORY_MSG, tsize ); // no memory
    10441043                        // 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 );
    10461045                } // if
    10471046                block->header.kind.real.blockSize = MarkMmappedBit( tsize ); // storage size for munmap
     
    11071106                if ( unlikely( munmap( header, size ) == -1 ) ) {
    11081107                        // 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"
    11101109                                   "Possible cause is invalid delete pointer: either not allocated or with corrupt header.",
    11111110                                   addr, errno );
     
    12171216
    12181217#ifdef __STATISTICS__
    1219 static void incCalls( intptr_t statName ) libcfa_nopreempt {
     1218static void incCalls( long int statName ) libcfa_nopreempt {
    12201219        heapManager->stats.counters[statName].calls += 1;
    12211220} // incCalls
    12221221
    1223 static void incZeroCalls( intptr_t statName ) libcfa_nopreempt {
     1222static void incZeroCalls( long int statName ) libcfa_nopreempt {
    12241223        heapManager->stats.counters[statName].calls_0 += 1;
    12251224} // incZeroCalls
     
    12271226
    12281227#ifdef __CFA_DEBUG__
    1229 static void incUnfreed( intptr_t offset ) libcfa_nopreempt {
     1228static void incUnfreed( size_t offset ) libcfa_nopreempt {
    12301229        heapManager->allocUnfreed += offset;
    12311230} // incUnfreed
     
    15681567                if ( write( STDERR_FILENO, MALLOC_STATS_MSG, sizeof( MALLOC_STATS_MSG ) - 1 /* size includes '\0' */ ) == -1 ) {
    15691568                #endif // __STATISTICS__
    1570                         abort( "**** Error **** write failed in malloc_stats" );
     1569                        abort( "write failed in malloc_stats" );
    15711570                } // if
    15721571        } // malloc_stats
Note: See TracChangeset for help on using the changeset viewer.