Sort-of improve multi-line editor when in vi mode.

[cycript.git] / Pooling.hpp

diff --git a/Pooling.hpp b/Pooling.hpp
index 1c1f219537f9401efcf4c66e73e6f36cc08a7980..c03dd1db62bf51798428f790e0a1593a8423aac1 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -43,6 +43,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_;


@@ -70,9 +71,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)
     {
     }


@@ -90,8 +92,8 @@ class CYPool {
         size = align(size);
 
         if (size > size_) {
         size = align(size);
 
         if (size > size_) {

-            // XXX: is this an optimal malloc size?
-            size_ = std::max<size_t>(size, size + align(sizeof(Cleaner)));
+            size_ = std::max<size_t>(next_, size + align(sizeof(Cleaner)));
+            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_);


@@ -115,12 +117,12 @@ class CYPool {
         return copy;
     }
 
         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));

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