Mark compact

src/plan/global.rs

@@ -135,6 +135,9 @@ pub fn create_mutator<VM: VMBinding>(
         PlanSelector::PageProtect => {
             crate::plan::pageprotect::mutator::create_pp_mutator(tls, &*mmtk.plan)
         }
+        PlanSelector::MarkCompact => {
+            crate::plan::markcompact::mutator::create_markcompact_mutator(tls, &*mmtk.plan)
+        }
     })
 }
 
@@ -165,6 +168,9 @@ pub fn create_plan<VM: VMBinding>(
         PlanSelector::PageProtect => Box::new(crate::plan::pageprotect::PageProtect::new(
             vm_map, mmapper, options,
         )),
+        PlanSelector::MarkCompact => Box::new(crate::plan::markcompact::MarkCompact::new(
+            vm_map, mmapper, options,
+        )),
     }
 }
 

src/plan/markcompact/gc_work.rs

@@ -0,0 +1,197 @@
+use super::global::MarkCompact;
+use crate::plan::global::NoCopy;
+use crate::policy::markcompactspace::MarkCompactSpace;
+use crate::policy::space::Space;
+use crate::scheduler::gc_work::*;
+use crate::scheduler::GCWork;
+use crate::scheduler::GCWorker;
+use crate::scheduler::WorkBucketStage;
+use crate::util::{Address, ObjectReference};
+use crate::vm::ActivePlan;
+use crate::vm::Scanning;
+use crate::vm::VMBinding;
+use crate::MMTK;
+use std::marker::PhantomData;
+use std::ops::{Deref, DerefMut};
+
+/// iterate through the heap and calculate the new location of live objects
+pub struct CalculateForwardingAddress<VM: VMBinding> {
+    mc_space: &'static MarkCompactSpace<VM>,
+}
+
+impl<VM: VMBinding> GCWork<VM> for CalculateForwardingAddress<VM> {
+    #[inline]
+    fn do_work(&mut self, _worker: &mut GCWorker<VM>, _mmtk: &'static MMTK<VM>) {
+        self.mc_space.calculate_forwarding_pointer();
+    }
+}
+
+impl<VM: VMBinding> CalculateForwardingAddress<VM> {
+    pub fn new(mc_space: &'static MarkCompactSpace<VM>) -> Self {
+        Self { mc_space }
+    }
+}
+
+/// create another round of root scanning work packets
+/// to update object references
+pub struct UpdateReferences<VM: VMBinding> {
+    p: PhantomData<VM>,
+}
+
+impl<VM: VMBinding> GCWork<VM> for UpdateReferences<VM> {
+    #[inline]
+    fn do_work(&mut self, _worker: &mut GCWorker<VM>, mmtk: &'static MMTK<VM>) {
+        // The following needs to be done right before the second round of root scanning
+        VM::VMScanning::prepare_for_roots_re_scanning();
+        mmtk.plan.base().prepare_for_stack_scanning();
+        #[cfg(feature = "extreme_assertions")]
+        crate::util::edge_logger::reset();
+
+        // TODO investigate why the following will create duplicate edges
+        // scheduler.work_buckets[WorkBucketStage::RefForwarding]
+        //     .add(ScanStackRoots::<ForwardingProcessEdges<VM>>::new());
+        for mutator in VM::VMActivePlan::mutators() {
+            mmtk.scheduler.work_buckets[WorkBucketStage::RefForwarding]
+                .add(ScanStackRoot::<ForwardingProcessEdges<VM>>(mutator));
+        }
+
+        mmtk.scheduler.work_buckets[WorkBucketStage::RefForwarding]
+            .add(ScanVMSpecificRoots::<ForwardingProcessEdges<VM>>::new());
+    }
+}
+
+impl<VM: VMBinding> UpdateReferences<VM> {
+    pub fn new() -> Self {
+        Self { p: PhantomData }
+    }
+}
+
+/// compact live objects based on forwarding pointers calculated before
+pub struct Compact<VM: VMBinding> {
+    mc_space: &'static MarkCompactSpace<VM>,
+}
+
+impl<VM: VMBinding> GCWork<VM> for Compact<VM> {
+    #[inline]
+    fn do_work(&mut self, _worker: &mut GCWorker<VM>, _mmtk: &'static MMTK<VM>) {
+        self.mc_space.compact();
+    }
+}
+
+impl<VM: VMBinding> Compact<VM> {
+    pub fn new(mc_space: &'static MarkCompactSpace<VM>) -> Self {
+        Self { mc_space }
+    }
+}
+
+// Transitive closure to mark live objects
+pub struct MarkingProcessEdges<VM: VMBinding> {
+    plan: &'static MarkCompact<VM>,
+    base: ProcessEdgesBase<MarkingProcessEdges<VM>>,
+}
+
+impl<VM: VMBinding> MarkingProcessEdges<VM> {
+    fn markcompact(&self) -> &'static MarkCompact<VM> {
+        self.plan
+    }
+}
+
+impl<VM: VMBinding> ProcessEdgesWork for MarkingProcessEdges<VM> {
+    type VM = VM;
+    fn new(edges: Vec<Address>, roots: bool, mmtk: &'static MMTK<VM>) -> Self {
+        let base = ProcessEdgesBase::new(edges, roots, mmtk);
+        let plan = base.plan().downcast_ref::<MarkCompact<VM>>().unwrap();
+        Self { base, plan }
+    }
+
+    #[inline]
+    fn trace_object(&mut self, object: ObjectReference) -> ObjectReference {
+        if object.is_null() {
+            return object;
+        }
+        if self.markcompact().mc_space().in_space(object) {
+            self.markcompact()
+                .mc_space()
+                .trace_mark_object::<Self>(self, object)
+        } else {
+            self.markcompact()
+                .common
+                .trace_object::<Self, NoCopy<VM>>(self, object)
+        }
+    }
+}
+
+impl<VM: VMBinding> Deref for MarkingProcessEdges<VM> {
+    type Target = ProcessEdgesBase<Self>;
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        &self.base
+    }
+}
+
+impl<VM: VMBinding> DerefMut for MarkingProcessEdges<VM> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.base
+    }
+}
+
+/// Transitive closure to update object references
+pub struct ForwardingProcessEdges<VM: VMBinding> {
+    plan: &'static MarkCompact<VM>,
+    base: ProcessEdgesBase<ForwardingProcessEdges<VM>>,
+}
+
+impl<VM: VMBinding> ForwardingProcessEdges<VM> {
+    fn markcompact(&self) -> &'static MarkCompact<VM> {
+        self.plan
+    }
+}
+
+impl<VM: VMBinding> ProcessEdgesWork for ForwardingProcessEdges<VM> {
+    type VM = VM;
+    fn new(edges: Vec<Address>, roots: bool, mmtk: &'static MMTK<VM>) -> Self {
+        let base = ProcessEdgesBase::new(edges, roots, mmtk);
+        let plan = base.plan().downcast_ref::<MarkCompact<VM>>().unwrap();
+        Self { base, plan }
+    }
+
+    #[inline]
+    fn trace_object(&mut self, object: ObjectReference) -> ObjectReference {
+        if object.is_null() {
+            return object;
+        }
+        if self.markcompact().mc_space().in_space(object) {
+            self.markcompact()
+                .mc_space()
+                .trace_forward_object::<Self>(self, object)
+        } else {
+            self.markcompact()
+                .common
+                .trace_object::<Self, NoCopy<VM>>(self, object)
+        }
+    }
+}
+
+impl<VM: VMBinding> Deref for ForwardingProcessEdges<VM> {
+    type Target = ProcessEdgesBase<Self>;
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        &self.base
+    }
+}
+
+impl<VM: VMBinding> DerefMut for ForwardingProcessEdges<VM> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.base
+    }
+}
+
+pub struct MarkCompactGCWorkContext<VM: VMBinding>(std::marker::PhantomData<VM>);
+impl<VM: VMBinding> crate::scheduler::GCWorkContext for MarkCompactGCWorkContext<VM> {
+    type VM = VM;
+    type PlanType = MarkCompact<VM>;
+    type CopyContextType = NoCopy<VM>;
+    type ProcessEdgesWorkType = MarkingProcessEdges<VM>;
+}