Improve the interface and algorithms of BlockAllocator

[r2c2.git] / source / libr2c2 / blockallocator.h

diff --git a/source/libr2c2/blockallocator.h b/source/libr2c2/blockallocator.h
index 7ff5d77f2cf538b4effc9fa4c40826b9a8cb956d..c90b450bb52f11248ce1f8d016a0e73163e5b0a0 100644 (file)
--- a/source/libr2c2/blockallocator.h
+++ b/source/libr2c2/blockallocator.h
@@ -48,15 +48,25 @@ public:
        const BlockIter &first() const;
        const BlockIter &last() const;
        const BlockIter &last_current() const;
+       const BlockIter &iter_for(const Block &) const;
 
-       int get_entry_to_block(const Block &) const;
+       bool has_block(const Block &) const;
+       bool is_block_current(const Block &) const;
+private:
+       BlockList::const_iterator find_block(const BlockList::const_iterator &, const BlockList::const_iterator &, const Block &) const;
 
+public:
        void reserve_more();
+private:
+       bool reserve_block(const BlockIter &);
+public:
        void release_until(const Block &);
        bool release_from(const Block &);
        void release_noncurrent();
 private:
-       void release_blocks(const BlockList::iterator &, const BlockList::iterator &);
+       void release_blocks_begin(const BlockList::iterator &);
+       void release_blocks_end(const BlockList::iterator &);
+       void release_block(const BlockList::iterator &);
 public:
        void reverse();