webapps: better style

[factor.git] / vm / to_tenured_collector.cpp

diff --git a/vm/to_tenured_collector.cpp b/vm/to_tenured_collector.cpp
index 1242acd897f3e0b8267caeebad33f8c5d95a147f..532dcaeade453bfa737850f20742910f5f0b1c9e 100644 (file)
--- a/vm/to_tenured_collector.cpp
+++ b/vm/to_tenured_collector.cpp
@@ -1,27 +1,37 @@
 #include "master.hpp"
 
-namespace factor
-{
+namespace factor {
 
-to_tenured_collector::to_tenured_collector(factor_vm *myvm_) :
-       copying_collector<tenured_space,to_tenured_policy>
-       (myvm_,myvm_->data->tenured,to_tenured_policy(myvm_)) {}
+void factor_vm::collect_to_tenured() {
+  // Copy live objects from aging space to tenured space.
+  mark_stack.clear();
+  slot_visitor<from_tenured_refs_copier>
+      visitor(this, from_tenured_refs_copier(data->tenured, &mark_stack));
 
-void factor_vm::collect_to_tenured()
-{
-       to_tenured_collector collector(this);
+  visitor.visit_all_roots();
+  gc_event* event = current_gc->event;
 
-       collector.trace_roots();
-       collector.trace_contexts();
-       collector.trace_cards(data->tenured);
-       collector.trace_code_heap_roots(&code->points_to_aging);
-       collector.cheneys_algorithm();
-       update_dirty_code_blocks(&code->points_to_aging);
+  if (event)
+    event->reset_timer();
+  visitor.visit_cards(data->tenured, card_points_to_aging, 0xff);
+  if (event) {
+    event->ended_phase(PHASE_CARD_SCAN);
+    event->cards_scanned += visitor.cards_scanned;
+    event->decks_scanned += visitor.decks_scanned;
+  }
 
-       nursery.here = nursery.start;
-       reset_generation(data->aging);
-       code->points_to_nursery.clear();
-       code->points_to_aging.clear();
+  if (event)
+    event->reset_timer();
+  visitor.visit_code_heap_roots(&code->points_to_aging);
+  if (event) {
+    event->ended_phase(PHASE_CODE_SCAN);
+    event->code_blocks_scanned += code->points_to_aging.size();
+  }
+  visitor.visit_mark_stack(&mark_stack);
+
+  data->reset_nursery();
+  data->reset_aging();
+  code->clear_remembered_set();
 }
 
 }