Make Pointer/Struct .type compatible with Functor.

[cycript.git] / Pooling.hpp

diff --git a/Pooling.hpp b/Pooling.hpp
index 1c1f219537f9401efcf4c66e73e6f36cc08a7980..3af05acf2ae74d11ef28bdf41c1bfe4849ac69c0 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -35,6 +35,14 @@
 #include "Local.hpp"
 #include "Standard.hpp"
 
 #include "Local.hpp"
 #include "Standard.hpp"
 

+// XXX: std::aligned_storage and alignof
+static const size_t CYAlignment(sizeof(void *));
+
+template <typename Type_>
+static void CYAlign(Type_ &data, size_t size) {
+    data = reinterpret_cast<Type_>((reinterpret_cast<uintptr_t>(data) + (size - 1)) & ~static_cast<uintptr_t>(size - 1));
+}
+

 class CYPool;
 _finline void *operator new(size_t size, CYPool &pool);
 _finline void *operator new [](size_t size, CYPool &pool);
 class CYPool;
 _finline void *operator new(size_t size, CYPool &pool);
 _finline void *operator new [](size_t size, CYPool &pool);


@@ -43,6 +51,7 @@ class CYPool {
   private:
     uint8_t *data_;
     size_t size_;
   private:
     uint8_t *data_;
     size_t size_;

+    size_t next_;

 
     struct Cleaner {
         Cleaner *next_;
 
     struct Cleaner {
         Cleaner *next_;


@@ -57,11 +66,6 @@ class CYPool {
         }
     } *cleaner_;
 
         }
     } *cleaner_;
 

-    static _finline size_t align(size_t size) {
-        // XXX: alignment is more complex than this
-        return (size + 7) & ~0x3;
-    }
-

     template <typename Type_>
     static void delete_(void *data) {
         reinterpret_cast<Type_ *>(data)->~Type_();
     template <typename Type_>
     static void delete_(void *data) {
         reinterpret_cast<Type_ *>(data)->~Type_();


@@ -70,9 +74,10 @@ class CYPool {
     CYPool(const CYPool &);
 
   public:
     CYPool(const CYPool &);
 
   public:

-    CYPool() :
+    CYPool(size_t next = 64) :

         data_(NULL),
         size_(0),
         data_(NULL),
         size_(0),

+        next_(next),

         cleaner_(NULL)
     {
     }
         cleaner_(NULL)
     {
     }


@@ -86,20 +91,27 @@ class CYPool {
     }
 
     template <typename Type_>
     }
 
     template <typename Type_>

-    Type_ *malloc(size_t size) {
-        size = align(size);
-
-        if (size > size_) {
-            // XXX: is this an optimal malloc size?
-            size_ = std::max<size_t>(size, size + align(sizeof(Cleaner)));
+    Type_ *malloc(size_t size, size_t alignment = CYAlignment) {
+        uint8_t *end(data_);
+        CYAlign(end, alignment);
+        end += size;
+
+        if (size_t(end - data_) > size_) {
+            size_t need(sizeof(Cleaner));
+            CYAlign(need, alignment);
+            need += size;
+            size_ = std::max<size_t>(next_, need);
+            next_ *= 2;

             data_ = reinterpret_cast<uint8_t *>(::malloc(size_));
             atexit(free, data_);
             _assert(size <= size_);
         }
 
             data_ = reinterpret_cast<uint8_t *>(::malloc(size_));
             atexit(free, data_);
             _assert(size <= size_);
         }
 

-        void *data(data_);
-        data_ += size;
-        size_ -= size;
+        uint8_t *data(data_);
+        CYAlign(data, alignment);
+        end = data + size;
+        size_ -= end - data_;
+        data_ = end;

         return reinterpret_cast<Type_ *>(data);
     }
 
         return reinterpret_cast<Type_ *>(data);
     }
 


@@ -109,18 +121,19 @@ class CYPool {
         return reinterpret_cast<char *>(memdup(data, strlen(data) + 1));
     }
 
         return reinterpret_cast<char *>(memdup(data, strlen(data) + 1));
     }
 

-    void *memdup(const void *data, size_t size) {
-        void *copy(malloc<void>(size));
+    template <typename Type_>
+    Type_ *memdup(const Type_ *data, size_t size, size_t alignment = CYAlignment) {
+        Type_ *copy(malloc<Type_>(size, alignment));

         memcpy(copy, data, size);
         return copy;
     }
 
         memcpy(copy, data, size);
         return copy;
     }
 

-    char *strndup(const char *data, size_t size) const {
+    char *strndup(const char *data, size_t size) {

         return strmemdup(data, strnlen(data, size));
     }
 
         return strmemdup(data, strnlen(data, size));
     }
 

-    char *strmemdup(const char *data, size_t size) const {
-        char *copy(new char[size + 1]);
+    char *strmemdup(const char *data, size_t size) {
+        char *copy(malloc<char>(size + 1, 1));

         memcpy(copy, data, size);
         copy[size] = '\0';
         return copy;
         memcpy(copy, data, size);
         copy[size] = '\0';
         return copy;


@@ -139,7 +152,7 @@ class CYPool {
             va_end(args);
         }
 
             va_end(args);
         }
 

-        char *copy(malloc<char>(size + 1)); {
+        char *copy(malloc<char>(size + 1, 1)); {

             va_list args;
             va_start(args, data);
 
             va_list args;
             va_start(args, data);