Changes in libcfa/src/heap.cfa [c86f587:f76ff0b]

File:

• libcfa/src/heap.cfa (modified) (2 diffs)

libcfa/src/heap.cfa

@@ -1239 +1239 @@
         size_t odsize = dataStorage( bsize, oaddr, header ); // data storage available in bucket
 
-        if ( oalign <= nalign && (uintptr_t)oaddr % nalign == 0 ) { // <= alignment and new alignment happens to match
-                if ( oalign > libAlign() ) {                                    // fake header ?
-                        headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-                } // if
+        if ( oalign == nalign && size <= odsize && odsize <= size * 2 ) { // <= alignment and new alignment are same, allow 50% wasted storage for smaller size
+                header->kind.real.blockSize &= -2;                      // turn off 0 fill
+                header->kind.real.size = size;                          // reset allocation size
+                return oaddr;
+        } // if
+        if ( oalign < nalign && (uintptr_t)oaddr % nalign == 0 && oalign > libAlign() ) { // <= alignment and new alignment happens to match, and oaddr has a fake header
+                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
                 if ( size <= odsize && odsize <= size * 2 ) {   // allow 50% wasted storage for smaller size
                         header->kind.real.blockSize &= -2;                      // turn off 0 fill
@@ -1282 +1285 @@
         headers( "realloc", oaddr, header, freeElem, bsize, oalign );
 
-        if ( oalign <= nalign && (uintptr_t)oaddr % nalign == 0 ) { // <= alignment and new alignment happens to match
-                if ( oalign > libAlign() ) {                                    // fake header ?
-                        headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
-                } // if
+        if ( oalign == nalign ) { // <= alignment and new alignment are same
+                return realloc( oaddr, size );
+        } // if
+        if ( oalign < nalign && (uintptr_t)oaddr % nalign == 0 && oalign > libAlign() ) { // <= alignment and new alignment happens to match, and oaddr has a fake header
+                headerAddr( oaddr )->kind.fake.alignment = nalign | 1; // update alignment (could be the same)
                 return realloc( oaddr, size );
         } // if