Ignore:
Timestamp:
Dec 6, 2019, 3:15:35 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
e307e12
Parents:
924c5ce (diff), dab98b3e (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.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/heap.cfa

    r924c5ce re1990f1  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Nov 29 17:33:58 2019
    13 // Update Count     : 641
     12// Last Modified On : Wed Dec  4 21:42:46 2019
     13// Update Count     : 646
    1414//
    1515
     
    3535static bool traceHeap = false;
    3636
    37 inline bool traceHeap() {
    38         return traceHeap;
    39 } // traceHeap
     37inline bool traceHeap() { return traceHeap; }
    4038
    4139bool traceHeapOn() {
     
    5048        return temp;
    5149} // traceHeapOff
     50
     51bool traceHeapTerm() { return false; }
    5252
    5353
     
    694694static void ^?{}( HeapManager & ) {
    695695        #ifdef __STATISTICS__
    696         // if ( traceHeapTerm() ) {
    697         //      printStats();
    698         //      if ( prtfree() ) prtFree( heapManager, true );
    699         // } // if
     696        if ( traceHeapTerm() ) {
     697                printStats();
     698                // if ( prtfree() ) prtFree( heapManager, true );
     699        } // if
    700700        #endif // __STATISTICS__
    701701} // ~HeapManager
     
    855855                #endif // __STATISTICS__
    856856
    857           if ( unlikely( size == 0 ) ) { free( oaddr ); return 0p; } // special cases
     857                // If size is equal to 0, either NULL or a pointer suitable to be passed to free() is returned.
     858          if ( unlikely( size == 0 ) ) { free( oaddr ); return mallocNoStats( size ); } // special cases
    858859          if ( unlikely( oaddr == 0p ) ) return mallocNoStats( size );
    859860
     
    10821083        #endif // __STATISTICS__
    10831084
    1084   if ( unlikely( size == 0 ) ) { free( oaddr ); return 0p; } // special cases
     1085        // If size is equal to 0, either NULL or a pointer suitable to be passed to free() is returned.
     1086  if ( unlikely( size == 0 ) ) { free( oaddr ); return mallocNoStats( size ); } // special cases
    10851087  if ( unlikely( oaddr == 0p ) ) return mallocNoStats( size );
    10861088
Note: See TracChangeset for help on using the changeset viewer.