Changeset c65b930 for libcfa


Ignore:
Timestamp:
May 25, 2021, 4:15:06 PM (4 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
375fb46, 82f4063
Parents:
b984d54 (diff), 887fc79 (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

    rb984d54 rc65b930  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed May  5 13:11:28 2021
    13 // Update Count     : 1035
     12// Last Modified On : Sat May 22 08:46:39 2021
     13// Update Count     : 1036
    1414//
    1515
     
    640640
    641641                #ifdef __STATISTICS__
    642                 free_storage += size;
    643                 #endif // __STATISTICS__
     642                __atomic_add_fetch( &free_calls, 1, __ATOMIC_SEQ_CST );
     643                __atomic_add_fetch( &free_storage, size, __ATOMIC_SEQ_CST );
     644                #endif // __STATISTICS__
     645
    644646                #if BUCKETLOCK == SPINLOCK
    645647                lock( freeElem->lock __cfaabi_dbg_ctx2 );               // acquire spin lock
Note: See TracChangeset for help on using the changeset viewer.