io.streams.256color: faster by caching styles

[factor.git] / vm / data_heap.hpp

diff --git a/vm/data_heap.hpp b/vm/data_heap.hpp
old mode 100755 (executable)
new mode 100644 (file)
index fe714b9..4e3e85c
--- a/vm/data_heap.hpp
+++ b/vm/data_heap.hpp
@@ -1,56 +1,58 @@
-namespace factor
-{
+namespace factor {
 
 struct data_heap {
-       cell start;
-
-       cell young_size;
-       cell aging_size;
-       cell tenured_size;
-
-       segment *seg;
-
-       nursery_space *nursery;
-       aging_space *aging;
-       aging_space *aging_semispace;
-       tenured_space *tenured;
-
-       card *cards;
-       card *cards_end;
-
-       card_deck *decks;
-       card_deck *decks_end;
-       
-       explicit data_heap(cell young_size, cell aging_size, cell tenured_size);
-       ~data_heap();
-       data_heap *grow(cell requested_size);
-       template<typename Generation> void clear_cards(Generation *gen);
-       template<typename Generation> void clear_decks(Generation *gen);
-       template<typename Generation> void reset_generation(Generation *gen);
+  cell start;
+
+  cell young_size;
+  cell aging_size;
+  cell tenured_size;
+
+  segment* seg;
+
+  // Borrowed reference to a factor_vm::nursery
+  bump_allocator* nursery;
+  aging_space* aging;
+  aging_space* aging_semispace;
+  tenured_space* tenured;
+
+  card* cards;
+  card* cards_end;
+
+  card_deck* decks;
+  card_deck* decks_end;
+
+  data_heap(bump_allocator* vm_nursery,
+            cell young_size,
+            cell aging_size,
+            cell tenured_size);
+  ~data_heap();
+  data_heap* grow(bump_allocator* vm_nursery, cell requested_size);
+  template <typename Generation> void clear_cards(Generation* gen);
+  template <typename Generation> void clear_decks(Generation* gen);
+  void reset_nursery();
+  void reset_aging();
+  void reset_tenured();
+  bool high_fragmentation_p();
+  bool low_memory_p();
+  void mark_all_cards();
+  cell high_water_mark() { return nursery->size + aging->size; }
 };
 
-template<typename Generation> void data_heap::clear_cards(Generation *gen)
-{
-       cell first_card = addr_to_card(gen->start - start);
-       cell last_card = addr_to_card(gen->end - start);
-       memset(&cards[first_card],0,last_card - first_card);
-}
-
-template<typename Generation> void data_heap::clear_decks(Generation *gen)
-{
-       cell first_deck = addr_to_deck(gen->start - start);
-       cell last_deck = addr_to_deck(gen->end - start);
-       memset(&decks[first_deck],0,last_deck - first_deck);
-}
-
-/* After garbage collection, any generations which are now empty need to have
-their allocation pointers and cards reset. */
-template<typename Generation> void data_heap::reset_generation(Generation *gen)
-{
-       gen->here = gen->start;
-       clear_cards(gen);
-       clear_decks(gen);
-       gen->starts.clear_object_start_offsets();
-}
+struct data_heap_room {
+  cell nursery_size;
+  cell nursery_occupied;
+  cell nursery_free;
+  cell aging_size;
+  cell aging_occupied;
+  cell aging_free;
+  cell tenured_size;
+  cell tenured_occupied;
+  cell tenured_total_free;
+  cell tenured_contiguous_free;
+  cell tenured_free_block_count;
+  cell cards;
+  cell decks;
+  cell mark_stack;
+};
 
 }