webapps.wiki: adding search bar

[factor.git] / vm / nursery_collector.cpp

diff --git a/vm/nursery_collector.cpp b/vm/nursery_collector.cpp
index 240fac60d9b7fcbd6bb297fa95052d203f9fc7c1..3634110d1e4a7222e7595cd21eeb2bd78236fe02 100644 (file)
--- a/vm/nursery_collector.cpp
+++ b/vm/nursery_collector.cpp
@@ -1,44 +1,73 @@
 #include "master.hpp"
 
-namespace factor
-{
-
-nursery_collector::nursery_collector(factor_vm *parent_) :
-       copying_collector<aging_space,nursery_policy>(
-               parent_,
-               parent_->data->aging,
-               nursery_policy(parent_)) {}
-
-void factor_vm::collect_nursery()
-{
-       /* Copy live objects from the nursery (as determined by the root set and
-       marked cards in aging and tenured) to aging space. */
-       nursery_collector collector(this);
-
-       collector.trace_roots();
-       collector.trace_contexts();
-
-       current_gc->event->started_card_scan();
-       collector.trace_cards(data->tenured,
-               card_points_to_nursery,
-               simple_unmarker(card_points_to_nursery));
-       collector.trace_cards(data->aging,
-               card_points_to_nursery,
-               simple_unmarker(card_mark_mask));
-       current_gc->event->ended_card_scan(collector.cards_scanned,collector.decks_scanned);
-
-       current_gc->event->started_code_scan();
-       collector.trace_code_heap_roots(&code->points_to_nursery);
-       current_gc->event->ended_code_scan(collector.code_blocks_scanned);
-
-       collector.cheneys_algorithm();
-
-       current_gc->event->started_code_sweep();
-       update_code_heap_for_minor_gc(&code->points_to_nursery);
-       current_gc->event->ended_code_sweep();
-
-       data->reset_generation(&nursery);
-       code->points_to_nursery.clear();
+namespace factor {
+
+struct nursery_copier : no_fixup {
+  bump_allocator* nursery;
+  aging_space* aging;
+
+  nursery_copier(bump_allocator* nursery, aging_space* aging)
+      : nursery(nursery), aging(aging) { }
+
+  object* fixup_data(object* obj) {
+    if (!nursery->contains_p(obj)) {
+      return obj;
+    }
+
+    // The while-loop is a needed micro-optimization.
+    while (obj->forwarding_pointer_p()) {
+      obj = obj->forwarding_pointer();
+    }
+
+    if (!nursery->contains_p(obj)) {
+      return obj;
+    }
+
+    cell size = obj->size();
+    object* newpointer = aging->allot(size);
+    if (!newpointer)
+      throw must_start_gc_again();
+
+    memcpy(newpointer, obj, size);
+    obj->forward_to(newpointer);
+    return newpointer;
+  }
+};
+
+void factor_vm::collect_nursery() {
+  // Copy live objects from the nursery (as determined by the root set and
+  // marked cards in aging and tenured) to aging space.
+  slot_visitor<nursery_copier>
+      visitor(this, nursery_copier(data->nursery, data->aging));
+
+  cell scan = data->aging->start + data->aging->occupied_space();
+
+  visitor.visit_all_roots();
+  gc_event* event = current_gc->event;
+
+  if (event)
+    event->reset_timer();
+  visitor.visit_cards(data->tenured, card_points_to_nursery,
+                      card_points_to_nursery);
+  visitor.visit_cards(data->aging, card_points_to_nursery, 0xff);
+  if (event) {
+    event->ended_phase(PHASE_CARD_SCAN);
+    event->cards_scanned += visitor.cards_scanned;
+    event->decks_scanned += visitor.decks_scanned;
+  }
+
+  if (event)
+    event->reset_timer();
+  visitor.visit_code_heap_roots(&code->points_to_nursery);
+  if (event) {
+    event->ended_phase(PHASE_CODE_SCAN);
+    event->code_blocks_scanned += code->points_to_nursery.size();
+  }
+
+  visitor.cheneys_algorithm(data->aging, scan);
+
+  data->reset_nursery();
+  code->points_to_nursery.clear();
 }
 
 }