webapps.wiki: adding search bar

[factor.git] / vm / allot.hpp

diff --git a/vm/allot.hpp b/vm/allot.hpp
index da4a69913b4845757fdbc1eb23438b19e15d0d77..1987b2b0e4f463f8b35350406541bad4b941ff8f 100644 (file)
--- a/vm/allot.hpp
+++ b/vm/allot.hpp
@@ -9,20 +9,21 @@ inline code_block* factor_vm::allot_code_block(cell size,
   cell block_size = size + sizeof(code_block);
   code_block* block = code->allocator->allot(block_size);
 
-  // If allocation failed, do a full GC and compact the code heap.
-  // A full GC that occurs as a result of the data heap filling up does not
-  // trigger a compaction. This setup ensures that most GCs do not compact
-  // the code heap, but if the code fills up, it probably means it will be
-  // fragmented after GC anyway, so its best to compact.
   if (block == NULL) {
+    // If allocation failed, do a full GC and compact the code heap.
+    // A full GC that occurs as a result of the data heap filling up does not
+    // trigger a compaction. This setup ensures that most GCs do not compact
+    // the code heap, but if the code fills up, it probably means it will be
+    // fragmented after GC anyway, so its best to compact.
     primitive_compact_gc();
     block = code->allocator->allot(block_size);
 
     // Insufficient room even after code GC, give up
     if (block == NULL) {
-      std::cout << "Code heap used: " << code->allocator->occupied_space()
-                << "\n";
-      std::cout << "Code heap free: " << code->allocator->free_space << "\n";
+      std::cout << "Code heap used:               " << code->allocator->occupied_space() << "\n";
+      std::cout << "Code heap free:               " << code->allocator->free_space << "\n";
+      std::cout << "Code heap free_block_count:   " << code->allocator->free_block_count << "\n";
+      std::cout << "Code heap largest_free_block: " << code->allocator->largest_free_block() << "\n";
       std::cout << "Request       : " << block_size << "\n";
       fatal_error("Out of memory in allot_code_block", 0);
     }
@@ -39,16 +40,15 @@ inline code_block* factor_vm::allot_code_block(cell size,
 // Allocates memory
 inline object* factor_vm::allot_large_object(cell type, cell size) {
   // If tenured space does not have enough room, collect and compact
-  cell requested_size = size + data->high_water_mark();
-  if (!data->tenured->can_allot_p(requested_size)) {
+  cell required_free = size + data->high_water_mark();
+  if (!data->tenured->can_allot_p(required_free)) {
     primitive_compact_gc();
 
     // If it still won't fit, grow the heap
-    if (!data->tenured->can_allot_p(requested_size)) {
-      gc(collect_growing_data_heap_op, size);
+    if (!data->tenured->can_allot_p(required_free)) {
+      gc(COLLECT_GROWING_DATA_HEAP_OP, size);
     }
   }
-
   object* obj = data->tenured->allot(size);
 
   // Allows initialization code to store old->new pointers