From 3914b0264b3a309ceb4da60850ca9af02b496e0b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 7 Oct 2009 08:40:28 -0500
Subject: [PATCH] vm: rename a few things

---
 vm/data_gc.cpp | 24 ++++++++++++------------
 vm/data_gc.hpp |  6 +++---
 vm/vm.hpp      |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/vm/data_gc.cpp b/vm/data_gc.cpp
index 0fa5e1b07f..47effccf85 100755
--- a/vm/data_gc.cpp
+++ b/vm/data_gc.cpp
@@ -71,7 +71,7 @@ template<typename Strategy> object *factor_vm::promote_object(object *untagged,
 	object *newpointer = strategy.allot(size);
 	if(!newpointer) longjmp(current_gc->gc_unwind,1);
 
-	generation_stats *s = &stats.generations[current_gc->collecting_gen];
+	generation_statistics *s = &gc_stats.generations[current_gc->collecting_gen];
 	s->object_count++;
 	s->bytes_copied += size;
 
@@ -91,7 +91,7 @@ template<typename Strategy> void factor_vm::trace_card(card *ptr, cell gen, cell
 
 	strategy.copy_reachable_objects(card_scan,&card_end);
 
-	stats.cards_scanned++;
+	gc_stats.cards_scanned++;
 }
 
 template<typename Strategy> void factor_vm::trace_card_deck(card_deck *deck, cell gen, card mask, card unmask, Strategy &strategy)
@@ -122,7 +122,7 @@ template<typename Strategy> void factor_vm::trace_card_deck(card_deck *deck, cel
 		}
 	}
 
-	stats.decks_scanned++;
+	gc_stats.decks_scanned++;
 }
 
 /* Trace all objects referenced from marked cards */
@@ -201,7 +201,7 @@ template<typename Strategy> void factor_vm::trace_cards(Strategy &strategy)
 	for(i = current_gc->collecting_gen + 1; i < gen_count; i++)
 		trace_generation_cards(i,strategy);
 
-	stats.card_scan_time += (current_micros() - start);
+	gc_stats.card_scan_time += (current_micros() - start);
 }
 
 /* Copy all tagged pointers in a range of memory */
@@ -353,7 +353,7 @@ template<typename Strategy> void factor_vm::trace_code_heap_roots(Strategy &stra
 				trace_literal_references(iter->first,strategy);
 		}
 
-		stats.code_heap_scans++;
+		gc_stats.code_heap_scans++;
 	}
 }
 
@@ -609,7 +609,7 @@ void factor_vm::collect_tenured(cell requested_bytes, bool trace_contexts_)
 
 void factor_vm::record_gc_stats()
 {
-	generation_stats *s = &stats.generations[current_gc->collecting_gen];
+	generation_statistics *s = &gc_stats.generations[current_gc->collecting_gen];
 
 	cell gc_elapsed = (current_micros() - current_gc->start_time);
 	s->collections++;
@@ -694,7 +694,7 @@ void factor_vm::primitive_gc_stats()
 
 	for(i = 0; i < gen_count; i++)
 	{
-		generation_stats *s = &stats.generations[i];
+		generation_statistics *s = &gc_stats.generations[i];
 		result.add(allot_cell(s->collections));
 		result.add(tag<bignum>(long_long_to_bignum(s->gc_time)));
 		result.add(tag<bignum>(long_long_to_bignum(s->max_gc_time)));
@@ -706,10 +706,10 @@ void factor_vm::primitive_gc_stats()
 	}
 
 	result.add(tag<bignum>(ulong_long_to_bignum(total_gc_time)));
-	result.add(tag<bignum>(ulong_long_to_bignum(stats.cards_scanned)));
-	result.add(tag<bignum>(ulong_long_to_bignum(stats.decks_scanned)));
-	result.add(tag<bignum>(ulong_long_to_bignum(stats.card_scan_time)));
-	result.add(allot_cell(stats.code_heap_scans));
+	result.add(tag<bignum>(ulong_long_to_bignum(gc_stats.cards_scanned)));
+	result.add(tag<bignum>(ulong_long_to_bignum(gc_stats.decks_scanned)));
+	result.add(tag<bignum>(ulong_long_to_bignum(gc_stats.card_scan_time)));
+	result.add(allot_cell(gc_stats.code_heap_scans));
 
 	result.trim();
 	dpush(result.elements.value());
@@ -717,7 +717,7 @@ void factor_vm::primitive_gc_stats()
 
 void factor_vm::clear_gc_stats()
 {
-	memset(&stats,0,sizeof(gc_stats));
+	memset(&gc_stats,0,sizeof(gc_statistics));
 }
 
 void factor_vm::primitive_clear_gc_stats()
diff --git a/vm/data_gc.hpp b/vm/data_gc.hpp
index 04a9682ae5..68aab2f6b3 100755
--- a/vm/data_gc.hpp
+++ b/vm/data_gc.hpp
@@ -2,7 +2,7 @@ namespace factor
 {
 
 /* statistics */
-struct generation_stats {
+struct generation_statistics {
 	cell collections;
 	u64 gc_time;
 	u64 max_gc_time;
@@ -10,8 +10,8 @@ struct generation_stats {
 	u64 bytes_copied;
 };
 
-struct gc_stats {
-	generation_stats generations[gen_count];
+struct gc_statistics {
+	generation_statistics generations[gen_count];
 	u64 cards_scanned;
 	u64 decks_scanned;
 	u64 card_scan_time;
diff --git a/vm/vm.hpp b/vm/vm.hpp
index 772f8bcfdb..0ad1303156 100755
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -50,6 +50,9 @@ struct factor_vm
 	/* Data heap */
 	data_heap *data;
 
+	/* Code heap */
+	code_heap *code;
+
 	/* Where we store object start offsets in cards */
 	cell allot_markers_offset;
 
@@ -57,10 +60,7 @@ struct factor_vm
 	gc_state *current_gc;
 
 	/* Statistics */
-	gc_stats stats;
-
-	/* Code heap */
-	code_heap *code;
+	gc_statistics gc_stats;
 
 	/* If a runtime function needs to call another function which potentially
 	   allocates memory, it must wrap any local variable references to Factor