Changeset 07b59ec for libcfa/src/heap.cfa

Timestamp:

Jul 31, 2023, 4:59:46 PM (12 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

28c2933

Parents:

c68f6e6

Message:

change startup sequence by adding back heapManagerBootFlag, add build flag for non-null return for malloc(0)

File:

• libcfa/src/heap.cfa (modified) (8 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 : Fri Jul 28 18:27:53 2023
+// Update Count     : 1612
 //
 
@@ -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 );
 
@@ -526 +532 @@
         // 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 +542 @@
 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
@@ -895 +902 @@
 #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 ); \