webapps.wiki: adding search bar

[factor.git] / vm / nursery_collector.cpp

diff --git a/vm/nursery_collector.cpp b/vm/nursery_collector.cpp
index b966a56200943119f875fbb5e795f783cf07eafe..3634110d1e4a7222e7595cd21eeb2bd78236fe02 100644 (file)
--- a/vm/nursery_collector.cpp
+++ b/vm/nursery_collector.cpp
@@ -2,40 +2,71 @@
 
 namespace factor {
 
-nursery_collector::nursery_collector(factor_vm* parent)
-    : copying_collector<aging_space, nursery_policy>(parent,
-                                                     parent->data->aging,
-                                                     nursery_policy(parent)) {}
+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. */
-  nursery_collector collector(this);
+  // 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));
 
-  collector.trace_roots();
-  collector.trace_contexts();
+  cell scan = data->aging->start + data->aging->occupied_space();
 
+  visitor.visit_all_roots();
   gc_event* event = current_gc->event;
 
   if (event)
-    event->started_card_scan();
-  collector.trace_cards(data->tenured, card_points_to_nursery,
-                        simple_unmarker(card_points_to_nursery));
-  if (data->aging->here != data->aging->start) {
-    collector.trace_cards(data->aging, card_points_to_nursery, full_unmarker());
+    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->ended_card_scan(collector.cards_scanned, collector.decks_scanned);
 
   if (event)
-    event->started_code_scan();
-  collector.trace_code_heap_roots(&code->points_to_nursery);
-  if (event)
-    event->ended_code_scan(collector.code_blocks_scanned);
+    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();
+  }
 
-  collector.cheneys_algorithm();
+  visitor.cheneys_algorithm(data->aging, scan);
 
-  data->reset_generation(&nursery);
+  data->reset_nursery();
   code->points_to_nursery.clear();
 }