Changeset 1076d05

Timestamp:

May 6, 2020, 8:45:52 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0a6d8204

Parents:

be91ab4

Message:

small code clean ups after complete code walk through

File:

• libcfa/src/heap.cfa (modified) (18 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 : Sat Apr 18 17:43:15 2020
-// Update Count     : 718
+// Last Modified On : Wed May  6 17:29:26 2020
+// Update Count     : 727
 //
 
@@ -19 +19 @@
 #include <errno.h>                                                                              // errno
 #include <string.h>                                                                             // memset, memcpy
+#include <limits.h>                                                                             // ULONG_MAX
 extern "C" {
 #include <sys/mman.h>                                                                   // mmap, munmap
 } // extern "C"
 
-// #comment TD : Many of these should be merged into math I believe
 #include "bits/align.hfa"                                                               // libPow2
 #include "bits/defs.hfa"                                                                // likely, unlikely
@@ -30 +30 @@
 //#include "stdlib.hfa"                                                                 // bsearchl
 #include "malloc.h"
+#include "bitmanip.hfa"                                                                 // ceiling
 
 #define MIN(x, y) (y > x ? x : y)
@@ -81 +82 @@
 };
 
+size_t default_heap_expansion() __attribute__(( weak )) {
+        return __CFA_DEFAULT_HEAP_EXPANSION__;
+} // default_heap_expansion
+
 size_t default_mmap_start() __attribute__(( weak )) {
         return __CFA_DEFAULT_MMAP_START__;
 } // default_mmap_start
-
-size_t default_heap_expansion() __attribute__(( weak )) {
-        return __CFA_DEFAULT_HEAP_EXPANSION__;
-} // default_heap_expansion
 
 
@@ -360 +361 @@
 
 
-static inline bool setHeapExpand( size_t value ) {
-  if ( heapExpand < pageSize ) return true;
-        heapExpand = value;
-        return false;
-} // setHeapExpand
-
-
 // thunk problem
 size_t Bsearchl( unsigned int key, const unsigned int * vals, size_t dim ) {
@@ -383 +377 @@
 
 static inline bool setMmapStart( size_t value ) {               // true => mmapped, false => sbrk
-  if ( value < pageSize || bucketSizes[NoBucketSizes - 1] < value ) return true;
+  if ( value < pageSize || bucketSizes[NoBucketSizes - 1] < value ) return false;
         mmapStart = value;                                                                      // set global
 
@@ -390 +384 @@
         assert( maxBucketsUsed < NoBucketSizes );                       // subscript failure ?
         assert( mmapStart <= bucketSizes[maxBucketsUsed] ); // search failure ?
-        return false;
+        return true;
 } // setMmapStart
 
@@ -449 +443 @@
 
         #ifdef __CFA_DEBUG__
-        checkHeader( addr < heapBegin || header < (HeapManager.Storage.Header *)heapBegin, name, addr ); // bad low address ?
+        checkHeader( addr < heapBegin, name, addr );            // bad low address ?
         #endif // __CFA_DEBUG__
 
@@ -508 +502 @@
         // along with the block and is a multiple of the alignment size.
 
-  if ( unlikely( size > ~0ul - sizeof(HeapManager.Storage) ) ) return 0p;
+  if ( unlikely( size > ULONG_MAX - sizeof(HeapManager.Storage) ) ) return 0p;
         size_t tsize = size + sizeof(HeapManager.Storage);
         if ( likely( tsize < mmapStart ) ) {                            // small size => sbrk
@@ -560 +554 @@
                 block->header.kind.real.home = freeElem;                // pointer back to free list of apropriate size
         } else {                                                                                        // large size => mmap
-  if ( unlikely( size > ~0ul - pageSize ) ) return 0p;
+  if ( unlikely( size > ULONG_MAX - pageSize ) ) return 0p;
                 tsize = libCeiling( tsize, pageSize );                  // must be multiple of page size
                 #ifdef __STATISTICS__
@@ -702 +696 @@
         #endif // FASTLOOKUP
 
-        if ( setMmapStart( default_mmap_start() ) ) {
+        if ( ! setMmapStart( default_mmap_start() ) ) {
                 abort( "HeapManager : internal error, mmap start initialization failure." );
         } // if
@@ -708 +702 @@
 
         char * end = (char *)sbrk( 0 );
-        sbrk( (char *)libCeiling( (long unsigned int)end, libAlign() ) - end ); // move start of heap to multiple of alignment
-        heapBegin = heapEnd = sbrk( 0 );                                        // get new start point
+        heapBegin = heapEnd = sbrk( (char *)libCeiling( (long unsigned int)end, libAlign() ) - end ); // move start of heap to multiple of alignment
 } // HeapManager
 
@@ -735 +728 @@
         //assert( heapManager.heapBegin != 0 );
         //heapManager{};
-        if ( heapManager.heapBegin == 0p ) heapManager{};
+        if ( heapManager.heapBegin == 0p ) heapManager{};       // sanity check
 } // memory_startup
 
@@ -863 +856 @@
                 #endif // __STATISTICS__
 
-                size_t size = dim * elemSize;
-                char * addr = (char *)mallocNoStats( size );
-          if ( unlikely( addr == 0p ) ) return 0p;
-
-                HeapManager.Storage.Header * header;
-                HeapManager.FreeHeader * freeElem;
-                size_t bsize, alignment;
-                headers( "aalloc", addr, header, freeElem, bsize, alignment );
-
-                header->kind.real.blockSize |= 2;                               // mark as zero filled
-                return addr;
+                return mallocNoStats( dim * elemSize );
         } // aalloc
 
@@ -914 +897 @@
         
                 // change size, DO NOT preserve STICKY PROPERTIES.
+                free( oaddr );
                 void * naddr = mallocNoStats( size );                   // create new area
-                free( oaddr );
                 return naddr;
         } // resize
@@ -988 +971 @@
                 #endif // __STATISTICS__
 
-                size_t size = dim * elemSize;
-                char * addr = (char *)memalignNoStats( alignment, size );
-          if ( unlikely( addr == 0p ) ) return 0p;
-                HeapManager.Storage.Header * header;
-                HeapManager.FreeHeader * freeElem;
-                size_t bsize;
-                headers( "amemalign", addr, header, freeElem, bsize, alignment );
-
-                header->kind.real.blockSize |= 2;                               // mark as zero filled
-                return addr;
+                return memalignNoStats( alignment, dim * elemSize );
         } // amemalign
 
@@ -1043 +1017 @@
 
         // Frees the memory space pointed to by ptr, which must have been returned by a previous call to malloc(), calloc()
-        // or realloc().  Otherwise, or if free(ptr) has already been called before, undefined behavior occurs. If ptr is
+        // or realloc().  Otherwise, or if free(ptr) has already been called before, undefined behaviour occurs. If ptr is
         // 0p, no operation is performed.
         void free( void * addr ) {
@@ -1170 +1144 @@
 
 
-        // Adjusts parameters that control the behavior of the memory-allocation functions (see malloc). The param argument
+        // Adjusts parameters that control the behaviour of the memory-allocation functions (see malloc). The param argument
         // specifies the parameter to be modified, and value specifies the new value for that parameter.
         int mallopt( int option, int value ) {
                 choose( option ) {
                   case M_TOP_PAD:
-                        if ( setHeapExpand( value ) ) return 1;
+                        heapExpand = ceiling( value, pageSize ); return 1;
                   case M_MMAP_THRESHOLD:
                         if ( setMmapStart( value ) ) return 1;
+                        break;
                 } // switch
                 return 0;                                                                               // error, unsupported