From 85dade6914edca9dc0edaa9af2794a0878fd701e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Tue, 9 Sep 2014 17:56:56 +0200
Subject: [PATCH] VM: use a free_list_allocator for the callbacks, that way
 they can individually be freed

---
 vm/callbacks.cpp    | 15 ++++++++-------
 vm/callbacks.hpp    |  2 +-
 vm/slot_visitor.hpp | 14 +++++---------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/vm/callbacks.cpp b/vm/callbacks.cpp
index 784352b722..8aa9e80774 100644
--- a/vm/callbacks.cpp
+++ b/vm/callbacks.cpp
@@ -6,7 +6,7 @@ callback_heap::callback_heap(cell size, factor_vm* parent) {
   seg = new segment(size, true);
   if (!seg)
     fatal_error("Out of memory in callback_heap constructor", size);
-  allocator = new bump_allocator<code_block>(size, seg->start);
+  allocator = new free_list_allocator<code_block>(size, seg->start);
   this->parent = parent;
 
 }
@@ -65,19 +65,20 @@ void callback_heap::update(code_block* stub) {
 }
 
 code_block* callback_heap::add(cell owner, cell return_rewind) {
+  std::cout << "callback_heap::add" << std::endl;
   tagged<array> code_template(parent->special_objects[CALLBACK_STUB]);
   tagged<byte_array> insns(array_nth(code_template.untagged(), 1));
   cell size = array_capacity(insns.untagged());
 
   cell bump = align(size + sizeof(code_block), data_alignment);
-  if (allocator->here + bump > allocator->end) {
+  code_block* stub = allocator->allot(bump);
+  if (!stub) {
     parent->general_error(ERROR_CALLBACK_SPACE_OVERFLOW,
                           false_object,
                           false_object);
   }
 
-  code_block* stub = allocator->allot(bump);
-  stub->header = bump | 1;
+  stub->header = bump & ~7;
   stub->owner = owner;
   stub->parameters = false_object;
   stub->relocation = false_object;
@@ -114,14 +115,14 @@ struct callback_updater {
   explicit callback_updater(callback_heap* callbacks)
       : callbacks(callbacks) {}
 
-  void operator()(object* stub) {
-    callbacks->update((code_block*)stub);
+  void operator()(code_block* stub, cell size) {
+    callbacks->update(stub);
   }
 };
 
 void callback_heap::update() {
   callback_updater updater(this);
-  parent->each_object(allocator, updater);
+  allocator->iterate(updater);
 }
 
 /* Allocates memory */
diff --git a/vm/callbacks.hpp b/vm/callbacks.hpp
index 3bb0f6cc82..d841d17f49 100644
--- a/vm/callbacks.hpp
+++ b/vm/callbacks.hpp
@@ -25,7 +25,7 @@ from the callback heap in the previous session when the image was saved. */
 
 struct callback_heap {
   segment* seg;
-  bump_allocator<code_block>* allocator;
+  free_list_allocator<code_block>* allocator;
   factor_vm* parent;
 
   callback_heap(cell size, factor_vm* parent);
diff --git a/vm/slot_visitor.hpp b/vm/slot_visitor.hpp
index 1726ac7921..70b121d878 100644
--- a/vm/slot_visitor.hpp
+++ b/vm/slot_visitor.hpp
@@ -199,22 +199,18 @@ template <typename Fixup> void slot_visitor<Fixup>::visit_bignum_roots() {
 }
 
 template <typename Fixup> struct callback_slot_visitor {
-  callback_heap* callbacks;
   slot_visitor<Fixup>* visitor;
 
-  callback_slot_visitor(callback_heap* callbacks,
-                        slot_visitor<Fixup>* visitor)
-      : callbacks(callbacks), visitor(visitor) {}
+  callback_slot_visitor(slot_visitor<Fixup>* visitor) : visitor(visitor) {}
 
-  void operator()(object* stub) {
-    code_block *block = (code_block*)stub;
-    visitor->visit_handle(&block->owner);
+  void operator()(code_block* stub, cell size) {
+    visitor->visit_handle(&stub->owner);
   }
 };
 
 template <typename Fixup> void slot_visitor<Fixup>::visit_callback_roots() {
-  callback_slot_visitor<Fixup> callback_visitor(parent->callbacks, this);
-  parent->each_object(parent->callbacks->allocator, callback_visitor);
+  callback_slot_visitor<Fixup> callback_visitor(this);
+  parent->callbacks->allocator->iterate(callback_visitor);
 }
 
 template <typename Fixup>