Reduce default allocator heap size. Add GC check to Array::with_size()

Author: maximecb

src/alloc.rs

@@ -15,7 +15,7 @@ impl Alloc
 {
     pub fn new() -> Self
     {
-        Self::with_size(64 * 1024 * 1024)
+        Self::with_size(32 * 1024 * 1024)
     }
 
     pub fn with_size(mem_size_bytes: usize) -> Self

src/array.rs

@@ -145,9 +145,15 @@ impl Array
     }
 }
 
-pub fn array_with_size(actor: &mut Actor, _self: Value, num_elems: Value, fill_val: Value) -> Result<Value, String>
+pub fn array_with_size(actor: &mut Actor, _self: Value, num_elems: Value, mut fill_val: Value) -> Result<Value, String>
 {
     let num_elems = num_elems.unwrap_usize();
+
+    actor.gc_check(
+        size_of::<Array>() + size_of::<Value>() * num_elems,
+        &mut [&mut fill_val]
+    );
+
     let mut elems = actor.alloc.alloc_table(num_elems).unwrap();
     unsafe { (&mut *elems).fill(fill_val); }
     let arr = Array { elems, len: num_elems };

src/vm.rs

@@ -941,8 +941,11 @@ impl Actor
             // Try to copy all objects into the new allocator
             if try_copy(self, &mut dst_alloc, &mut dst_map, extra_roots).is_err() {
                 // If the copying fails, increase the heap size and try again
-                new_mem_size = (new_mem_size * 5) / 4;
-                println!("Increasing heap size to {} bytes", new_mem_size);
+                new_mem_size = (new_mem_size * 3) / 2;
+                println!(
+                    "Increasing heap size to {} bytes",
+                    thousands_sep(new_mem_size),
+                );
                 continue;
             }
 
@@ -951,7 +954,7 @@ impl Actor
             let bytes_free = dst_alloc.bytes_free();
             if bytes_free < min_free_bytes  {
                 // Increase the heap size and try again
-                new_mem_size = (new_mem_size * 5) / 4;
+                new_mem_size = (new_mem_size * 3) / 2;
                 println!(
                     "Increasing heap size to {} bytes",
                     thousands_sep(new_mem_size),

tests/gc_alloc_arrays.psh

@@ -1,4 +1,4 @@
-for (let var i = 0; i < 2_000_000; ++i)
+for (let var i = 0; i < 1_000_000; ++i)
 {
     let a = [0, 1, 2, 3, 4];
     assert(a.len == 5);

tests/gc_linked_list.psh

@@ -9,7 +9,7 @@ class Node
 
 let var list = nil;
 
-for (let var n = 0; n < 2_000; ++n)
+for (let var n = 0; n < 1_000; ++n)
 {
     list = nil;
 

tests/gc_list_extend.psh

@@ -8,7 +8,7 @@ class Node
 }
 
 let var list = nil;
-let num_nodes = 2_500_000;
+let num_nodes = 1_000_000;
 
 for (let var i = 0; i < num_nodes; ++i)
 {

tests/gc_str_concat.psh

@@ -1,6 +1,6 @@
 let var str = nil;
 
-for (let var n = 0; n < 1000; ++n)
+for (let var n = 0; n < 500; ++n)
 {
     str = "";