Found a memory management mistake (new Instance should not be transient) while workin...

[cycript.git] / Pooling.hpp

diff --git a/Pooling.hpp b/Pooling.hpp
index 6ca8542b6fea19c15127a51874ebd95845e4d3ba..a182906e0c9ef343a37e4ed2d135d23bfe2f78e9 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Error.hppution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler

  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -46,6 +46,8 @@
 #include "Exception.hpp"
 #include "Standard.hpp"
 
 #include "Exception.hpp"
 #include "Standard.hpp"
 

+#include <cstdlib>
+

 _finline void *operator new(size_t size, apr_pool_t *pool) {
     return apr_palloc(pool, size);
 }
 _finline void *operator new(size_t size, apr_pool_t *pool) {
     return apr_palloc(pool, size);
 }


@@ -86,6 +88,12 @@ class CYPool {
 
 struct CYData {
     apr_pool_t *pool_;
 
 struct CYData {
     apr_pool_t *pool_;

+    unsigned count_;
+
+    CYData() :
+        count_(1)
+    {
+    }

 
     virtual ~CYData() {
     }
 
     virtual ~CYData() {
     }


@@ -105,7 +113,60 @@ struct CYData {
     static void operator delete(void *data) {
         apr_pool_destroy(reinterpret_cast<CYData *>(data)->pool_);
     }
     static void operator delete(void *data) {
         apr_pool_destroy(reinterpret_cast<CYData *>(data)->pool_);
     }

+};
+
+template <typename Type_>
+struct CYPoolAllocator {
+    apr_pool_t *pool_;
+
+    typedef Type_ value_type;
+    typedef value_type *pointer;
+    typedef const value_type *const_pointer;
+    typedef value_type &reference;
+    typedef const value_type &const_reference;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+
+    CYPoolAllocator() :
+        pool_(NULL)
+    {
+    }
+
+    template <typename Right_>
+    CYPoolAllocator(const CYPoolAllocator<Right_> &rhs) :
+        pool_(rhs.pool_)
+    {
+    }
+
+    pointer allocate(size_type size, const void *hint = 0) {
+        return reinterpret_cast<pointer>(apr_palloc(pool_, size));
+    }
+
+    void deallocate(pointer data, size_type size) {
+    }
+
+    void construct(pointer address, const Type_ &rhs) {
+        new(address) Type_(rhs);
+    }
+
+    void destroy(pointer address) {
+        address->~Type_();
+    }
+
+    template <typename Right_>
+    inline bool operator==(const CYPoolAllocator<Right_> &rhs) {
+        return pool_ == rhs.pool_;
+    }
+
+    template <typename Right_>
+    inline bool operator!=(const CYPoolAllocator<Right_> &rhs) {
+        return !operator==(rhs);
+    }

 
 

+    template <typename Right_>
+    struct rebind {
+        typedef CYPoolAllocator<Right_> other;
+    };

 };
 
 #endif/*CYPOOLING_HPP*/
 };
 
 #endif/*CYPOOLING_HPP*/