Changeset 38cc59f for libcfa/src

Timestamp:

Oct 13, 2022, 5:05:23 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

f82f07e

Parents:

481f882 (diff), 7671c6d (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) (4 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 : Tue Oct 11 15:08:33 2022
-// Update Count     : 1525
+// Last Modified On : Wed Oct 12 18:06:01 2022
+// Update Count     : 1528
 //
 
@@ -453 +453 @@
 
 
-#define NO_MEMORY_MSG "insufficient heap memory available to allocate %zd new bytes."
+#define NO_MEMORY_MSG "**** Error **** insufficient heap memory available to allocate %zd new bytes."
 
 Heap * getHeap() with( heapMaster ) {
@@ -477 +477 @@
                                 if ( errno == ENOMEM ) abort( NO_MEMORY_MSG, size ); // no memory
                                 // Do not call strerror( errno ) as it may call malloc.
-                                abort( "attempt to allocate block of heaps of size %zu bytes and mmap failed with errno %d.", size, errno );
+                                abort( "**** Error **** attempt to allocate block of heaps of size %zu bytes and mmap failed with errno %d.", size, errno );
                         } // if
                         heapManagersStorageEnd = &heapManagersStorage[HeapDim]; // outside array
@@ -835 +835 @@
                 if ( unlikely( sbrk( increase ) == (void *)-1 ) ) {     // failed, no memory ?
                         unlock( extLock );
-                        __cfaabi_bits_print_nolock( STDERR_FILENO, NO_MEMORY_MSG, size );
-                        _exit( EXIT_FAILURE );                                          // give up
-                } // if
+                        abort( NO_MEMORY_MSG, size );                           // no memory
+                } // if
+
+                // Make storage executable for thunks.
+                if ( mprotect( (char *)heapEnd + heapRemaining, increase, __map_prot ) ) {
+                        unlock( extLock );
+                        abort( "**** Error **** attempt to make heap storage executable for thunks and mprotect failed with errno %d.", errno );
+                } // if
+
                 rem = heapRemaining + increase - size;