Changeset 10049 for ps

Timestamp:

08/21/11 12:30:35 (13 years ago)

Author:

Jan Wassenberg

Message:

remove Bucket allocator (superseded by upcoming Arena/Pool with expandable Storage policies)

Location:

ps/trunk/source/lib/allocators

Files:

• bucket.cpp (modified) (2 diffs)
• bucket.h (modified) (1 diff)

ps/trunk/source/lib/allocators/bucket.cpp

@@ -34 +34 @@
 // power-of-2 isn't required; value is arbitrary.
 const size_t bucketSize = 4000;
+
+
+template<typename T, class Allocator = Allocator_Heap, size_t bucketSize = pageSize>
+class Buckets
+{
+public:
+    // (must round up because freelist stores pointers inside objects)
+    static const size_t objectSize = ROUND_UP(sizeof(T), sizeof(intptr_t));
+
+    Buckets(size_t maxObjects)
+        : storage(maxObjects*objectSize)
+    {
+    }
+
+    size_t RemainingObjects()
+    {
+        return (storage.MaxCapacity() - end) / objectSize;
+    }
+
+    T* Allocate()
+    {
+        void* p = mem_freelist_Detach(freelist);
+        if(p)
+        {
+            ASSERT(Contains(p));
+            return (T*)p;
+        }
+
+        return (T*)StorageAppend(storage, end, objectSize);
+    }
+
+    void Deallocate(T* p)
+    {
+        ASSERT(Contains(p));
+        mem_freelist_AddToFront(freelist, p);
+    }
+
+private:
+    Storage storage;
+    size_t end;
+    void* freelist;
+};
+
 
 
@@ -132 +175 @@
     return ret;
 }
-
-
-void bucket_free(Bucket* b, void* el)
-{
-    if(b->el_size == 0)
-    {
-        DEBUG_WARN_ERR(ERR::LOGIC); // cannot free variable-size items
-        return;
-    }
-
-    mem_freelist_AddToFront(b->freelist, el);
-
-    // note: checking if <el> was actually allocated from <b> is difficult:
-    // it may not be in the currently open bucket, so we'd have to
-    // iterate over the list - too much work.
-}

ps/trunk/source/lib/allocators/bucket.h

@@ -100 +100 @@
 LIB_API void* bucket_fast_alloc(Bucket* b);
 
-/**
- * make an entry available for reuse in the given Bucket.
- *
- * this is not allowed if created for variable-size elements.
- * rationale: avoids having to pass el_size here and compare with size when
- * allocating; also prevents fragmentation and leaking memory.
- *
- * @param b Bucket*
- * @param el entry allocated via bucket_alloc.
- **/
-LIB_API void bucket_free(Bucket* b, void* el);
-
 #endif  // #ifndef INCLUDED_ALLOCATORS_BUCKET