Enable heap snapshot tests

Author: dinfuehr

Cargo.lock

@@ -28,6 +28,7 @@ fixedbitset = "*"
 num_cpus = "*"
 memoffset = "*"
 num_enum = "*"
+tempfile = "*"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.52"

dora-runtime/Cargo.toml

@@ -2,7 +2,7 @@ use parking_lot::Mutex;
 
 use std::cmp::{Ord, Ordering, PartialOrd};
 use std::fmt;
-use std::path::PathBuf;
+use std::fs::File;
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
 use std::sync::Arc;
 
@@ -137,7 +137,7 @@ impl Gc {
         }
 
         if let Some(ref snapshot_path) = vm.flags.snapshot_on_oom {
-            let snapshot_path = PathBuf::from(snapshot_path);
+            let snapshot_path = File::create(snapshot_path).expect("Failed to create file.");
             let snapshot = SnapshotGenerator::new(vm, snapshot_path).unwrap();
             snapshot.generate().expect("Failed to generate snapshot");
         }

dora-runtime/src/gc.rs

@@ -3,8 +3,7 @@ use std::thread;
 use std::time::Duration;
 
 use crossbeam_deque::{Injector, Steal, Stealer, Worker};
-use rand::distributions::{Distribution, Uniform};
-use rand::thread_rng;
+use rand::distr::uniform::{UniformSampler, UniformUsize};
 use scoped_threadpool::Pool;
 
 use crate::gc::root::Slot;
@@ -184,8 +183,9 @@ impl<'a> MarkingTask<'a> {
             return None;
         }
 
-        let mut rng = thread_rng();
-        let range = Uniform::new(0, self.stealers.len());
+        let mut rng = rand::rng();
+        let range =
+            UniformUsize::new(0, self.stealers.len()).expect("failed to create UniformUsize.");
 
         for _ in 0..2 * self.stealers.len() {
             let mut stealer_id = self.task_id;

dora-runtime/src/gc/pmarking.rs

@@ -16,8 +16,7 @@ use crate::threads::DoraThread;
 use crate::vm::VM;
 
 use crossbeam_deque::{Injector, Steal, Stealer, Worker};
-use rand::distributions::{Distribution, Uniform};
-use rand::thread_rng;
+use rand::distr::uniform::{UniformSampler, UniformUsize};
 use scoped_threadpool::Pool;
 
 pub struct MinorCollector<'a> {
@@ -728,8 +727,9 @@ impl<'a> CopyTask<'a> {
             return None;
         }
 
-        let mut rng = thread_rng();
-        let range = Uniform::new(0, self.stealers.len());
+        let mut rng = rand::rng();
+        let range =
+            UniformUsize::new(0, self.stealers.len()).expect("failed to create UniformUsize.");
 
         for _ in 0..2 * self.stealers.len() {
             let mut stealer_id = self.task_id;

dora-runtime/src/gc/swiper/minor.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufWriter, Result as IoResult};
-use std::path::PathBuf;
 use std::sync::Arc;
 
 use crate::gc::root::iterate_strong_roots;
@@ -45,9 +44,8 @@ pub struct SnapshotGenerator<'a> {
 }
 
 impl<'a> SnapshotGenerator<'a> {
-    pub fn new(vm: &'a VM, path: PathBuf) -> IoResult<SnapshotGenerator<'a>> {
-        let f = File::create(path)?;
-        let writer = BufWriter::new(f);
+    pub fn new(vm: &'a VM, file: File) -> IoResult<SnapshotGenerator<'a>> {
+        let writer = BufWriter::new(file);
         let placeholder = StringId(0);
 
         Ok(SnapshotGenerator {
@@ -618,7 +616,6 @@ impl<'a> SnapshotGenerator<'a> {
         let array: Ref<Array<u8>> = address.into();
         let length = array.len();
 
-        assert_eq!(shape.instance_size(), 0);
         let element_size = shape.element_size();
         let mut element_addr = array.data_address();
 

dora-runtime/src/snapshot.rs

@@ -1,6 +1,7 @@
 use libc;
 
 use std::char;
+use std::fs::File;
 use std::io::Write;
 use std::mem;
 use std::str;
@@ -89,6 +90,10 @@ pub const STDLIB_FUNCTIONS: &[(&'static str, FctImplementation)] = &[
         "stdlib::takeHeapSnapshot",
         N(stdlib::take_heap_snapshot as *const u8),
     ),
+    (
+        "stdlib::takeHeapSnapshotForTesting",
+        N(stdlib::take_heap_snapshot_for_testing as *const u8),
+    ),
     // Bool
     (
         "stdlib::traits::Equals for stdlib::primitives::Bool#equals",
@@ -1089,9 +1094,18 @@ pub extern "C" fn condition_wakeup_all(cond: Handle<Object>) {
 
 pub extern "C" fn take_heap_snapshot() {
     use crate::snapshot::SnapshotGenerator;
-    use std::path::PathBuf;
 
     let vm = get_vm();
-    let snapshot = SnapshotGenerator::new(vm, PathBuf::from("dora.heapsnapshot")).unwrap();
+    let file = File::create("dora.heapsnapshot").expect("Failed to create file");
+    let snapshot = SnapshotGenerator::new(vm, file).unwrap();
+    snapshot.generate().expect("Failed to generate snapshot");
+}
+
+pub extern "C" fn take_heap_snapshot_for_testing() {
+    use crate::snapshot::SnapshotGenerator;
+
+    let vm = get_vm();
+    let file = tempfile::tempfile().expect("Failed to open temporary file.");
+    let snapshot = SnapshotGenerator::new(vm, file).unwrap();
     snapshot.generate().expect("Failed to generate snapshot");
 }

dora-runtime/src/stdlib.rs

@@ -200,3 +200,4 @@ impl StacktraceElement {
 }
 
 @internal pub fn takeHeapSnapshot();
+@internal pub fn takeHeapSnapshotForTesting();

pkgs/std/std.dora

@@ -1,5 +1,3 @@
-//= ignore
-
 class Foo {
     name: String,
     x: Int32,
@@ -11,5 +9,5 @@ class Foo {
 
 fn main() {
     let foo = Foo(name = "This is a test", x = 1i32, y = 2, f1 = 3.0f32, f2 = 4.5, b = true);
-    std::takeHeapSnapshot();
+    std::takeHeapSnapshotForTesting();
 }

tests/snapshot/snapshot1.dora

@@ -1,9 +1,7 @@
-//= ignore
-
 fn main() {
     let foo = Vec[String]::new();
     foo.push("foo");
     foo.push("bar");
     foo.push("baz");
-    std::takeHeapSnapshot();
+    std::takeHeapSnapshotForTesting();
 }