Changeset 210c737 for libcfa/src

Timestamp:

Aug 1, 2023, 10:26:10 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

2cb15b0, d5f5eb7

Parents:

4852232 (diff), afb3d68 (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

Location:

libcfa/src

Files:

• heap.cfa (modified) (8 diffs)
• iostream.cfa (modified) (2 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 ); \

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 13:56:01 2023
-// Update Count     : 1403
+// Last Modified On : Sun Jul 30 23:01:00 2023
+// Update Count     : 1406
 //
 
@@ -230 +230 @@
         ostype & ?|?( ostype & os, const char s[] ) {
                 enum { Open = 1, Close, OpenClose };
-                static const unsigned char mask[256] @= {
+                static const unsigned char mask[256] @= {               // 256 covers all Latin-1 characters
                         // opening delimiters, no space after
                         ['('] : Open, ['['] : Open, ['{'] : Open,