Merge pull request #424 from evoskuil/master

Manage block memory allocation wrapping in linear allocator.

include/bitcoin/network/memory.hpp

@@ -34,7 +34,7 @@ class BCT_API memory
     virtual arena* get_arena() NOEXCEPT = 0;
 
     /// Get memory retainer.
-    virtual retainer::ptr get_retainer() NOEXCEPT = 0;
+    virtual retainer::ptr get_retainer(size_t allocation=zero) NOEXCEPT = 0;
 };
 
 /// Default tracked memory implementation (untracked).
@@ -49,8 +49,8 @@ class BCT_API default_memory final
     /// Get memory arena (system default).
     arena* get_arena() NOEXCEPT override;
 
-    /// Get memory retainer (empty pointer).
-    retainer::ptr get_retainer() NOEXCEPT override;
+    /// Get memory retainer (empty pointer, allocation unused).
+    retainer::ptr get_retainer(size_t=zero) NOEXCEPT override;
 };
 
 } // namespace network

src/memory.cpp

@@ -33,7 +33,7 @@ arena* default_memory::get_arena() NOEXCEPT
     return default_arena::get();
 }
 
-retainer::ptr default_memory::get_retainer() NOEXCEPT
+retainer::ptr default_memory::get_retainer(size_t) NOEXCEPT
 {
     return {};
 }

src/messages/block.cpp

@@ -32,6 +32,9 @@ namespace network {
 namespace messages {
 
 using namespace system;
+
+// Measured through block 550,000 - assumes consistent platform sizing.
+constexpr auto maximal_block = 11'904'912_size;
 
 const std::string block::command = "block";
 const identifier block::id = identifier::block;
@@ -47,17 +50,34 @@ typename block::cptr block::deserialize(uint32_t version,
 }
 
 // static
+// TODO: Move cached hashes to arena.
 typename block::cptr block::deserialize(memory& memory, uint32_t version,
     const system::data_chunk& data, bool witness) NOEXCEPT
 {
+    const auto arena = memory.get_arena();
+    if (arena == nullptr)
+        return nullptr;
+
+    // Must have at least maximal_block available to prevent block overflow.
+    ////uint8_t* begin = nullptr;
+    const auto capacity = arena->get_capacity();
+    if (capacity < maximal_block)
+        arena->deallocate(arena->allocate(capacity), capacity);
+    ////else
+    ////    begin = system::pointer_cast<uint8_t>(arena->allocate(zero));
+
     system::istream source{ data };
-    system::byte_reader reader{ source, memory.get_arena() };
+    system::byte_reader reader{ source, arena };
 
     // message, block and block_ptr are not allocated by reader's arena.
+    // chain::block consists only of three pointers and two integral values.
     const auto message = to_shared(deserialize(version, reader, witness));
     if (!reader)
         return nullptr;
 
+    ////const auto end = system::pointer_cast<uint8_t>(arena->allocate(zero));
+    ////const auto size = system::limit<size_t>(std::distance(begin, end));
+
     // Cache header hash.
     constexpr auto header_size = chain::header::serialized_size();
     const auto& header = message->block_ptr->header();