Changeset 7b0e8b7 for tests/collections

Timestamp:

Oct 18, 2021, 4:31:04 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

6f7aff3

Parents:

804bf677

Message:

String heap growth implemented

Location:

tests/collections

Files:

• .expect/string-ctx-manage.txt (modified) (1 diff)
• .expect/string-gc.txt (modified) (1 diff)
• string-ctx-manage.cfa (modified) (1 diff)
• string-gc.cfa (modified) (1 diff)

tests/collections/.expect/string-ctx-manage.txt

@@ -4 +4 @@
 bye
 hi
+bye
 done

tests/collections/.expect/string-gc.txt

@@ -38 +38 @@
 x from 5 to 15
 y from 5 to 15
+======================== fillNoCompact
+about to expand, a = aaa
+expanded, a = aaa
+about to expand, a = aaa
+expanded, a = aaa
+about to expand, a = aaa
+expanded, a = aaa
+about to expand, a = aaa
+expanded, a = aaa
+about to expand, a = aaa
+expanded, a = aaa

tests/collections/string-ctx-manage.cfa

@@ -36 +36 @@
     string y = x; // y allocates into private pad, implying eager copy
     assert( y.inner->Handle.s != x.inner->Handle.s);
+    assert( DEBUG_string_bytes_in_heap(y.inner->Handle.ulink) == y.inner->Handle.lnth );  // y is in a perfectly fitting heap
     sout | y; // hi
 
-    // -- following hits "need to implement actual growth"
-    //    and it passes if I modify string_res.cfa to oversize the owned heaps
-
-    // x = "bye";
-    // y = x; // into private y => eager copy
-    // assert( y.inner->Handle.s != x.inner->Handle.s);
-    // sout | y; // bye
+    x = "bye";
+    y = x; // into private y => eager copy
+    assert( y.inner->Handle.s != x.inner->Handle.s);
+//    assert( DEBUG_string_bytes_in_heap(y.inner->Handle.ulink) == y.inner->Handle.lnth );  // optimization required
+    sout | y; // bye
 }
 

tests/collections/string-gc.cfa

@@ -120 +120 @@
 }
 
+void fillNoCompact() {
+    // show that allocating in a heap filled with mostly live strings (no collectable garbage) causes heap growth
+
+    sout | "======================== fillNoCompact";
+
+    size_t lastTimeBytesAvail = bytesRemaining();
+    assert( lastTimeBytesAvail >= 200 ); // starting this test with nontrivial room
+
+    // mostly fill the pad
+    string_res a = "aaa";  // will have to be moved
+    string_res z = "zzz";
+    for (i; 5) {
+        while ( bytesRemaining() > 10 ) {
+            z += ".";
+        }
+        sout | "about to expand, a = " | a;
+        while ( bytesRemaining() <= 10 ) {
+            z += ".";
+        }
+        sout | "expanded, a = " | a;
+
+        // each growth gives more usable space than the last
+        assert( bytesRemaining() > lastTimeBytesAvail );
+        lastTimeBytesAvail = bytesRemaining();
+    }
+}
+
 int main() {
     basicFillCompact();
     fillCompact_withSharedEdits();
+    fillNoCompact();
 }