Move memory manager implementation into own file

Makes it easier to switch debug statements on and of to
track memory allocation. Also improved the API a bit.

Author: mgreter

Makefile

@@ -159,18 +159,19 @@ SOURCES = \
 	constants.cpp \
 	context.cpp \
 	cssize.cpp \
-	listize.cpp \
+	emitter.cpp \
 	error_handling.cpp \
 	eval.cpp \
 	expand.cpp \
 	extend.cpp \
 	file.cpp \
 	functions.cpp \
 	inspect.cpp \
+	json.cpp \
 	lexer.cpp \
+	listize.cpp \
+	memory_manager.cpp \
 	node.cpp \
-	json.cpp \
-	emitter.cpp \
 	output.cpp \
 	parser.cpp \
 	plugins.cpp \
@@ -308,4 +309,4 @@ lib-opts-shared:
         install install-static install-shared \
         lib-opts lib-opts-shared lib-opts-static \
         lib-file lib-file-shared lib-file-static
-.DELETE_ON_ERROR:
+.DELETE_ON_ERROR:

Makefile.am

@@ -31,7 +31,7 @@ lib_LTLIBRARIES = libsass.la
 
 libsass_la_SOURCES = \
 	ast_fwd_decl.hpp ast_def_macros.hpp \
-	kwd_arg_macros.hpp memory_manager.hpp \
+	kwd_arg_macros.hpp \
 	position.cpp position.hpp \
 	operation.hpp \
 	subset_map.hpp mapping.hpp \
@@ -56,6 +56,7 @@ libsass_la_SOURCES = \
 	functions.cpp functions.hpp \
 	inspect.cpp inspect.hpp \
 	lexer.cpp lexer.hpp \
+	memory_manager.cpp memory_manager.hpp \
 	node.cpp node.hpp \
 	json.cpp json.hpp \
 	emitter.cpp emitter.hpp \

memory_manager.cpp

@@ -0,0 +1,78 @@
+#include "ast.hpp"
+#include "memory_manager.hpp"
+
+namespace Sass {
+  using namespace std;
+
+  template <typename T>
+  Memory_Manager<T>::Memory_Manager(size_t size)
+  : nodes(vector<T*>())
+  {
+    size_t init = size;
+    if (init < 8) init = 8;
+    // reserve some space
+    nodes.reserve(init);
+  }
+
+  template <typename T>
+  Memory_Manager<T>::~Memory_Manager()
+  {
+    // release memory for all controlled nodes
+    // avoid calling erase for every single node 
+    for (size_t i = 0, S = nodes.size(); i < S; ++i) {
+      deallocate(nodes[i]);
+    }
+    // just in case
+    nodes.clear();
+  }
+
+  template <typename T>
+  T* Memory_Manager<T>::operator()(T* np)
+  {
+    // add to pool
+    nodes.push_back(np);
+    // return resource
+    return np;
+  }
+
+  template <typename T>
+  bool Memory_Manager<T>::has(T* np)
+  {
+    // check if the pointer is controlled under our pool
+    return find(nodes.begin(), nodes.end(), np) != nodes.end();
+  }
+
+  template <typename T>
+  T* Memory_Manager<T>::allocate(size_t size)
+  {
+    return static_cast<T*>(operator new(size));
+  }
+
+  template <typename T>
+  void Memory_Manager<T>::deallocate(T* np)
+  {
+    delete np;
+  }
+
+  template <typename T>
+  void Memory_Manager<T>::remove(T* np)
+  {
+    // remove node from pool (no longer active)
+    nodes.erase(find(nodes.begin(), nodes.end(), np));
+    // you are now in control of the memory
+  }
+
+  template <typename T>
+  void Memory_Manager<T>::destroy(T* np)
+  {
+    // remove from pool
+    remove(np);
+    // release memory
+    delete np;
+  }
+
+  // compile implementation for AST_Node
+  template class Memory_Manager<AST_Node>;
+
+}
+

memory_manager.hpp

@@ -18,40 +18,25 @@ namespace Sass {
     vector<T*> nodes;
 
   public:
-    Memory_Manager(size_t size = 0) : nodes(vector<T*>())
-    { nodes.reserve(size); }
-
-    ~Memory_Manager()
-    {
-      for (size_t i = 0, S = nodes.size(); i < S; ++i) {
-        // cout << "deleting " << typeid(*nodes[i]).name() << endl;
-        delete nodes[i];
-      }
-    }
-
-    T* operator()(T* np)
-    {
-      nodes.push_back(np);
-      // cout << "registering " << typeid(*np).name() << endl;
-      return np;
-    }
-
-    void remove(T* np)
-    {
-      nodes.erase(find(nodes.begin(), nodes.end(), np));
-    }
+    Memory_Manager(size_t size = 0);
+    ~Memory_Manager();
+
+    bool has(T* np);
+    T* allocate(size_t size);
+    void deallocate(T* np);
+    void remove(T* np);
+    void destroy(T* np);
+    T* operator()(T* np);
+
   };
 }
 
 template <typename T>
-inline void* operator new(size_t size, Sass::Memory_Manager<T>& mem_mgr)
-{ return mem_mgr(static_cast<T*>(operator new(size))); }
+inline void* operator new(size_t size, Sass::Memory_Manager<T>& mem)
+{ return mem.allocate(size); }
 
 template <typename T>
-inline void operator delete(void *np, Sass::Memory_Manager<T>& mem_mgr)
-{
-  mem_mgr.remove(reinterpret_cast<T*>(np));
-  operator delete(np);
-}
+inline void operator delete(void *np, Sass::Memory_Manager<T>& mem)
+{ mem.destroy(reinterpret_cast<T*>(np)); }
 
 #endif

win/libsass.filters

@@ -63,6 +63,9 @@
     <ClCompile Include="..\inspect.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\memory_manager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\node.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

win/libsass.vcxproj

@@ -177,6 +177,7 @@
     <ClCompile Include="..\functions.cpp" />
     <ClCompile Include="..\inspect.cpp" />
     <ClCompile Include="..\json.cpp" />
+    <ClCompile Include="..\memory_manager.cpp" />
     <ClCompile Include="..\node.cpp" />
     <ClCompile Include="..\emitter.cpp" />
     <ClCompile Include="..\output.cpp" />