Changeset 68d40b7

Timestamp:

Aug 15, 2020, 12:07:27 PM (4 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:

3b4750d

Parents:

c354108

Message:

change ceiling to ceiling2 for mallopt

File:

• libcfa/src/heap.cfa (modified) (3 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 : Sun Aug  9 12:23:20 2020
-// Update Count     : 894
+// Last Modified On : Wed Aug 12 16:43:38 2020
+// Update Count     : 902
 //
 
@@ -650 +650 @@
                 for ( HeapManager.Storage * p = freeLists[i].freeList; p != 0p; p = p->header.kind.real.next ) {
                 #else
-                for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; p = (p)`next->top ) {
+                // for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; p = (p)`next->top ) {
+                for ( HeapManager.Storage * p = top( freeLists[i].freeList ); p != 0p; /* p = getNext( p )->top */) {
+                        typeof(p) temp = (( p )`next)->top;                     // FIX ME: direct assignent fails, initialization works
+                        p = temp;
                 #endif // BUCKETLOCK
                         total += size;
@@ -1162 +1165 @@
                 choose( option ) {
                   case M_TOP_PAD:
-                        heapExpand = ceiling( value, pageSize ); return 1;
+                        heapExpand = ceiling2( value, pageSize ); return 1;
                   case M_MMAP_THRESHOLD:
                         if ( setMmapStart( value ) ) return 1;