Merge pull request #426 from evoskuil/master

Remove retainer.

include/bitcoin/network/memory.hpp

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

src/memory.cpp

@@ -33,10 +33,5 @@ arena* default_memory::get_arena() NOEXCEPT
  return default_arena::get();
 }
 
-retainer::ptr default_memory::get_retainer(size_t) NOEXCEPT
-{
- return {};
-}
-
 } // namespace network
 } // namespace libbitcoin

src/messages/block.cpp

@@ -65,7 +65,6 @@ typename block::cptr block::deserialize(memory& memory, uint32_t version,
  istream source{ data };
  byte_reader reader{ source, arena };
 
- // May block until all retainers of the arena are released.
  const auto begin = pointer_cast<uint8_t>(arena->require(maximal_block));
  const auto message = to_shared(deserialize(version, reader, witness));
  if (!reader)
@@ -109,9 +108,7 @@ typename block::cptr block::deserialize(memory& memory, uint32_t version,
  // TODO: system::limit is not necessary if allocation begin < end.
  const auto end = pointer_cast<uint8_t>(arena->allocate(zero));
  const auto allocated = limit<size_t>(std::distance(begin, end));
-
- // WARNING: retainer does not track objects shared from block (e.g. tx).
- message->block_ptr->set_retainer(memory.get_retainer(allocated));
+ message->block_ptr->set_allocation(allocated);
  return message;
 }