Changeset 2a301ff for libcfa/src/heap.cfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• libcfa/src/heap.cfa (modified) (10 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 : Fri Dec 30 08:37:37 2022
-// Update Count     : 1605
+// Last Modified On : Wed Aug  2 18:48:30 2023
+// Update Count     : 1614
 //
 
@@ -369 +369 @@
 static __thread size_t PAD1 CALIGN TLSMODEL __attribute__(( unused )); // protect false sharing
 static __thread Heap * heapManager CALIGN TLSMODEL;
+static  __thread bool heapManagerBootFlag CALIGN TLSMODEL = false;
 static __thread size_t PAD2 CALIGN TLSMODEL __attribute__(( unused )); // protect further false sharing
 
@@ -488 +489 @@
                         allocUnfreed = 0;
                         #endif // __CFA_DEBUG__
+                        heapManagerBootFlag = true;
                 } // with
         } // if
@@ -499 +501 @@
 
         lock( heapMaster.mgrLock );                                                     // protect heapMaster counters
+
+        assert( ! heapManagerBootFlag );
 
         // get storage for heap manager
@@ -514 +518 @@
 
 void heapManagerDtor() libcfa_public {
+  if ( unlikely( ! heapManagerBootFlag ) ) return;              // thread never used ?
+
         lock( heapMaster.mgrLock );
 
@@ -521 +527 @@
 
         #ifdef __STATISTICS__
+        heapMaster.stats += heapManager->stats;                         // retain this heap's statistics
         heapMaster.threads_exited += 1;
         #endif // __STATISTICS__
@@ -526 +533 @@
         // Do not set heapManager to NULL because it is used after Cforall is shutdown but before the program shuts down.
 
+        heapManagerBootFlag = false;
         unlock( heapMaster.mgrLock );
 } // heapManagerDtor
@@ -535 +543 @@
 extern int cfa_main_returned;                                                   // from interpose.cfa
 extern "C" {
-        void memory_startup( void ) {
+        void memory_startup( void ) {                                           // singleton => called once at start of program
                 if ( ! heapMasterBootFlag ) heapManagerCtor();  // sanity check
         } // memory_startup
@@ -557 +565 @@
                 fclose( stdin ); fclose( stdout );                              // free buffer storage
           if ( ! cfa_main_returned ) return;                            // do not check unfreed storage if exit called
+
+                #ifdef __STATISTICS__
+                if ( getenv( "CFA_MALLOC_STATS" ) ) {                   // check for external printing
+                        malloc_stats();
+                } // if
+                #endif // __STATISTICS__
 
                 #ifdef __CFA_DEBUG__
@@ -895 +909 @@
 #endif // __STATISTICS__
 
+// Uncomment to get allocation addresses for a 0-sized allocation rather than a null pointer.
+//#define __NONNULL_0_ALLOC__
+#if ! defined( __NONNULL_0_ALLOC__ )
+#define __NULL_0_ALLOC__ unlikely( size == 0 ) ||               /* 0 BYTE ALLOCATION RETURNS NULL POINTER */
+#else
+#define __NULL_0_ALLOC__
+#endif // __NONNULL_0_ALLOC__
+
 #define PROLOG( counter, ... ) \
         BOOT_HEAP_MANAGER; \
-        if ( unlikely( size == 0 ) ||                                           /* 0 BYTE ALLOCATION RETURNS NULL POINTER */ \
+        if ( \
+                __NULL_0_ALLOC__ \
                 unlikely( size > ULONG_MAX - sizeof(Heap.Storage) ) ) { /* error check */ \
                 STAT_0_CNT( counter ); \