io.streams.256color: faster by caching styles

[factor.git] / vm / full_collector.cpp

diff --git a/vm/full_collector.cpp b/vm/full_collector.cpp
index 7b466d88b43b6861a61f2de98ad609ae929bfb09..58f352d2f3676f6d6853e6744f0975f9f0a0b07f 100644 (file)
--- a/vm/full_collector.cpp
+++ b/vm/full_collector.cpp
@@ -57,6 +57,10 @@ struct full_collection_copier : no_fixup {
 };
 
 void factor_vm::collect_mark_impl() {
+  gc_event* event = current_gc->event;
+  if (event)
+    event->reset_timer();
+
   slot_visitor<full_collection_copier>
       visitor(this, full_collection_copier(data->tenured, code, &mark_stack));
 
@@ -75,16 +79,18 @@ void factor_vm::collect_mark_impl() {
   data->reset_aging();
   data->reset_nursery();
   code->clear_remembered_set();
+
+  if (event)
+    event->ended_phase(PHASE_MARKING);
 }
 
 void factor_vm::collect_sweep_impl() {
   gc_event* event = current_gc->event;
-
   if (event)
     event->reset_timer();
   data->tenured->sweep();
   if (event)
-    event->ended_data_sweep();
+    event->ended_phase(PHASE_DATA_SWEEP);
 
   // After a sweep, invalidate any code heap roots which are not
   // marked, so that if a block makes a tail call to a generic word,
@@ -102,7 +108,7 @@ void factor_vm::collect_sweep_impl() {
     event->reset_timer();
   code->sweep();
   if (event)
-    event->ended_code_sweep();
+    event->ended_phase(PHASE_CODE_SWEEP);
 }
 
 void factor_vm::collect_full() {
@@ -111,12 +117,12 @@ void factor_vm::collect_full() {
 
   if (data->low_memory_p()) {
     // Full GC did not free up enough memory. Grow the heap.
-    set_current_gc_op(collect_growing_data_heap_op);
+    set_current_gc_op(COLLECT_GROWING_DATA_HEAP_OP);
     collect_growing_data_heap(0);
   } else if (data->high_fragmentation_p()) {
     // Enough free memory, but it is not contiguous. Perform a
     // compaction.
-    set_current_gc_op(collect_compact_op);
+    set_current_gc_op(COLLECT_COMPACT_OP);
     collect_compact_impl();
   }