Changeset 8cbe732 for libcfa/src/heap.cfa

Timestamp:

Oct 13, 2023, 7:13:21 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

a97b9ed, bab2917

Parents:

85034ed (diff), 0bf0b978 (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:

• libcfa/src/heap.cfa (modified) (5 diffs)

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 11 11:21:10 2023
-// Update Count     : 1615
+// Last Modified On : Sat Sep 30 17:31:15 2023
+// Update Count     : 1617
 //
 
@@ -53 +53 @@
 #define TLSMODEL __attribute__(( tls_model("initial-exec") ))
 
-//#define __STATISTICS__
+#define __STATISTICS__
 
 enum {
@@ -681 +681 @@
 
 static HeapStatistics & collectStats( HeapStatistics & stats ) with( heapMaster ) {
-        lock( mgrLock );
+        lock( heapMaster.mgrLock );
 
         stats += heapMaster.stats;
@@ -688 +688 @@
         } // for
 
-        unlock( mgrLock );
+        unlock( heapMaster.mgrLock );
         return stats;
 } // collectStats
 
 static inline void clearStats() {
-        lock( mgrLock );
+        lock( heapMaster.mgrLock );
 
         // Zero the heap master and all active thread heaps.
@@ -701 +701 @@
         } // for
 
-        unlock( mgrLock );
+        unlock( heapMaster.mgrLock );
 } // clearStats
 #endif // __STATISTICS__