Changes in libcfa/src/heap.cfa [0f89d4f:2b23d78]

File:

• libcfa/src/heap.cfa (modified) (7 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 : Wed May 27 15:08:49 2020
-// Update Count     : 770
+// Last Modified On : Mon Jul 20 23:00:32 2020
+// Update Count     : 808
 //
 
@@ -208 +208 @@
 
 #if BUCKETLOCK == LOCKFREE
-static inline Link(HeapManager.Storage) * ?`next( HeapManager.Storage * this ) { return &this->header.kind.real.next; }
-static inline void ?{}( HeapManager.FreeHeader & ) {}
-static inline void ^?{}( HeapManager.FreeHeader & ) {}
+static inline {
+        Link(HeapManager.Storage) * ?`next( HeapManager.Storage * this ) { return &this->header.kind.real.next; }
+        void ?{}( HeapManager.FreeHeader & ) {}
+        void ^?{}( HeapManager.FreeHeader & ) {}
+} // distribution
 #endif // LOCKFREE
 
@@ -899 +901 @@
           if ( oalign == 0 && size <= odsize && odsize <= size * 2 ) { // allow 50% wasted storage for smaller size
                         header->kind.real.blockSize &= -2;                      // no alignment and turn off 0 fill
+                        if ( size != odsize ) header->kind.real.size = size; // reset allocation size
                         return oaddr;
                 } // if
@@ -927 +930 @@
 
                 size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
-          if ( size <= odsize && odsize <= size * 2 ) { // allow up to 50% wasted storage in smaller size
-                        // Do not know size of original allocation => cannot do 0 fill for any additional space because do not know
-                        // where to start filling, i.e., do not overwrite existing values in space.
+          if ( size <= odsize && odsize <= size * 2 ) {         // allow up to 50% wasted storage in smaller size
+                        if ( size != odsize ) header->kind.real.size = size; // reset allocation size
                         return oaddr;
                 } // if
@@ -1096 +1098 @@
         // Returns original total allocation size (not bucket size) => array size is dimension * sizeif(T).
         size_t malloc_size( void * addr ) {
-          if ( unlikely( addr == 0p ) ) return false;           // null allocation is not zero fill
+          if ( unlikely( addr == 0p ) ) return 0;                       // null allocation has zero size
                 HeapManager.Storage.Header * header = headerAddr( addr );
                 if ( (header->kind.fake.alignment & 1) == 1 ) { // fake header ?
@@ -1106 +1108 @@
         // Set allocation size and return previous size.
         size_t $malloc_size_set( void * addr, size_t size ) {
-          if ( unlikely( addr == 0p ) ) return false;           // null allocation is not zero fill
+          if ( unlikely( addr == 0p ) ) return 0;                       // null allocation has 0 size
                 HeapManager.Storage.Header * header = headerAddr( addr );
                 if ( (header->kind.fake.alignment & 1) == 1 ) { // fake header ?
@@ -1225 +1227 @@
                 if ( size <= odsize && odsize <= size * 2 ) {   // allow 50% wasted storage for smaller size
                         header->kind.real.blockSize &= -2;                      // turn off 0 fill
+                        if ( size != odsize ) header->kind.real.size = size; // reset allocation size
                         return oaddr;
                 } // if