Merge pull request #1509 from evoskuil/master

Change block's memory retainer cache to shared_ptr.
libbitcoin · Jul 30, 2024 · 7288c70 · 7288c70
2 parents 41dff01 + 3773f22
commit 7288c70
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 41 deletions.
diff --git a/include/bitcoin/system/allocator.hpp b/include/bitcoin/system/allocator.hpp
@@ -35,7 +35,7 @@ namespace libbitcoin {
 class retainer
 {
 public:
-    using ptr = std::unique_ptr<retainer>;
+    using ptr = std::shared_ptr<retainer>;
 
     DELETE_COPY_MOVE_DESTRUCT(retainer);
 

diff --git a/include/bitcoin/system/arena.hpp b/include/bitcoin/system/arena.hpp
@@ -23,8 +23,8 @@
 
 namespace libbitcoin {
 
-/// Memory resource interface, for use with our (polymorphic) allocator.
 /// Strictly conforms to std::pmr::memory_resource.
+/// Thread safe resource interface, for use with our (polymorphic) allocator.
 class arena
 {
 public:

diff --git a/include/bitcoin/system/chain/block.hpp b/include/bitcoin/system/chain/block.hpp
@@ -40,6 +40,8 @@ namespace chain {
 class BC_API block
 {
 public:
+    DEFAULT_COPY_MOVE_DESTRUCT(block);
+
     typedef std::shared_ptr<const block> cptr;
 
     static bool is_malleable64(const transaction_cptrs& txs) NOEXCEPT;
@@ -49,12 +51,6 @@ class BC_API block
 
     /// Default block is an invalid object.
     block() NOEXCEPT;
-    virtual ~block() NOEXCEPT;
-
-    /// Cache is defaulted on copy/assign.
-    block(block&& other) NOEXCEPT;
-    block(const block& other) NOEXCEPT;
-
     block(chain::header&& header, transactions&& txs) NOEXCEPT;
     block(const chain::header& header, const transactions& txs) NOEXCEPT;
     block(const chain::header::cptr& header,
@@ -71,10 +67,6 @@ class BC_API block
     /// Operators.
     /// -----------------------------------------------------------------------
 
-    /// Cache is defaulted on copy/assign.
-    block& operator=(block&& other) NOEXCEPT;
-    block& operator=(const block& other) NOEXCEPT;
-
     bool operator==(const block& other) const NOEXCEPT;
     bool operator!=(const block& other) const NOEXCEPT;
 

diff --git a/src/chain/block.cpp b/src/chain/block.cpp
@@ -55,20 +55,6 @@ block::block() NOEXCEPT
 {
 }
 
-block::~block() NOEXCEPT
-{
-}
-
-block::block(block&& other) NOEXCEPT
-  : block(other)
-{
-}
-
-block::block(const block& other) NOEXCEPT
-  : block(other.header_, other.txs_, other.valid_)
-{
-}
-
 block::block(chain::header&& header, chain::transactions&& txs) NOEXCEPT
   : block(to_shared(std::move(header)), to_shareds(std::move(txs)), true)
 {
@@ -141,21 +127,6 @@ block::block(const chain::header::cptr& header,
 // Operators.
 // ----------------------------------------------------------------------------
 
-block& block::operator=(block&& other) NOEXCEPT
-{
-    *this = other;
-    return *this;
-}
-
-block& block::operator=(const block& other) NOEXCEPT
-{
-    header_ = other.header_;
-    txs_ = other.txs_;
-    valid_ = other.valid_;
-    size_ = other.size_;
-    return *this;
-}
-
 bool block::operator==(const block& other) const NOEXCEPT
 {
     return (header_ == other.header_ || *header_ == *other.header_)
@@ -189,6 +160,8 @@ void block::assign_data(reader& source, bool witness) NOEXCEPT
 
 // Retainer will be an empty pointer when default allocator is used.
 // Retainer release informs allocator that associated memory may be freed.
+// Retainer is copied on block copy/assign, since allocations are thus shared.
+// WARNING: retainer does not track objects shared from the block (e.g. tx).
 void block::set_retainer(retainer::ptr&& retainer) const NOEXCEPT
 {
     retainer_ = std::move(retainer);