audio.engine.test: cleanup using

[factor.git] / vm / gc.hpp

diff --git a/vm/gc.hpp b/vm/gc.hpp
index a1eb59addc26f2c7f50d14893c588afe7d520bbf..b28038e8029fd6e89f1126802da4e8f81623551d 100644 (file)
--- a/vm/gc.hpp
+++ b/vm/gc.hpp
@@ -4,12 +4,22 @@ struct must_start_gc_again {
 };
 
 enum gc_op {
-  collect_nursery_op,
-  collect_aging_op,
-  collect_to_tenured_op,
-  collect_full_op,
-  collect_compact_op,
-  collect_growing_data_heap_op
+  COLLECT_NURSERY_OP,
+  COLLECT_AGING_OP,
+  COLLECT_TO_TENURED_OP,
+  COLLECT_FULL_OP,
+  COLLECT_COMPACT_OP,
+  COLLECT_GROWING_DATA_HEAP_OP
+};
+
+// These are the phases of the gc cycles we record the times of.
+enum gc_phase {
+  PHASE_CARD_SCAN,
+  PHASE_CODE_SCAN,
+  PHASE_DATA_SWEEP,
+  PHASE_CODE_SWEEP,
+  PHASE_DATA_COMPACTION,
+  PHASE_MARKING
 };
 
 struct gc_event {
@@ -23,20 +33,12 @@ struct gc_event {
   cell code_blocks_scanned;
   uint64_t start_time;
   cell total_time;
-  cell card_scan_time;
-  cell code_scan_time;
-  cell data_sweep_time;
-  cell code_sweep_time;
-  cell compaction_time;
+  cell times[6];
   uint64_t temp_time;
 
   gc_event(gc_op op, factor_vm* parent);
   void reset_timer();
-  void ended_card_scan(cell cards_scanned_, cell decks_scanned_);
-  void ended_code_scan(cell code_blocks_scanned_);
-  void ended_data_sweep();
-  void ended_code_sweep();
-  void ended_compaction();
+  void ended_phase(gc_phase phase);
   void ended_gc(factor_vm* parent);
 };