Make propagated blocks shared_ptr

Need to store the verified blocks removed from the block queue in a
shared_ptr and pass a copy of this shared ptr to EthereumCapability for
propagation because propagation happens on another thread.

Author: halfalicious

libethereum/Client.cpp

@@ -389,8 +389,8 @@ void Client::syncBlockQueue()
     unsigned count;
     Timer t;
 
-    VerifiedBlocks verifiedBlocks;
-    m_bq.drain(verifiedBlocks, m_syncAmount);
+    std::shared_ptr<VerifiedBlocks> verifiedBlocks = std::make_shared<VerifiedBlocks>();
+    m_bq.drain(*verifiedBlocks, m_syncAmount);
 
     // Propagate new blocks to peers before importing them into the chain
     auto h = m_host.lock();
@@ -403,7 +403,7 @@ void Client::syncBlockQueue()
     h->propagateBlocks(verifiedBlocks);
 
     h256s badBlockHashes;
-    tie(ir, count) = bc().sync(verifiedBlocks, badBlockHashes, m_stateDB);
+    tie(ir, count) = bc().sync(*verifiedBlocks, badBlockHashes, m_stateDB);
     m_syncBlockQueue = m_bq.doneDrain(badBlockHashes);
 
     double elapsed = t.elapsed();

libethereum/EthereumCapability.cpp

@@ -952,13 +952,13 @@ void EthereumCapability::removeSentTransactions(std::vector<h256> const& _txHash
     }
 }
 
-void EthereumCapability::propagateBlocks(VerifiedBlocks const& _blocks)
+void EthereumCapability::propagateBlocks(std::shared_ptr<VerifiedBlocks const> const& _blocks)
 {
-    if (_blocks.empty())
+    if (_blocks->empty())
         return;
 
-    m_host->postWork([this, &_blocks]() {
-        auto const currentHash = _blocks.cend()->verified.info.hash();
+    m_host->postWork([this, _blocks]() {
+        auto const currentHash = _blocks->back().verified.info.hash();
         auto const peersWithoutBlock = selectPeers(
             [&](EthereumPeer const& _peer) { return !_peer.isBlockKnown(currentHash); });
 
@@ -967,7 +967,7 @@ void EthereumCapability::propagateBlocks(VerifiedBlocks const& _blocks)
 
         std::vector<NodeID> peersToSend = randomPeers(peersWithoutBlock, peersToSendNumber);
         for (NodeID const& peerID : peersToSend)
-            for (auto const& b : _blocks)
+            for (auto const& b : *_blocks)
             {
                 RLPStream ts;
                 m_host->prep(peerID, name(), ts, NewBlockPacket, 2)
@@ -983,7 +983,7 @@ void EthereumCapability::propagateBlocks(VerifiedBlocks const& _blocks)
                 }
             }
         if (!peersToSend.empty())
-            LOG(m_logger) << "Sent " << _blocks.size() << " block(s) to " << peersToSend.size()
+            LOG(m_logger) << "Sent " << _blocks->size() << " block(s) to " << peersToSend.size()
                           << " peers";
     });
 }

libethereum/EthereumCapability.h

@@ -146,7 +146,7 @@ class EthereumCapability : public p2p::CapabilityFace
     /// Send new blocks to peers. Should be done after we've verified the PoW but before we've
     /// imported the blocks into the chain (in order to reduce the uncle rate). Actual sending of
     /// blocks is done on the network thread.
-    void propagateBlocks(VerifiedBlocks const& _blocks);
+    void propagateBlocks(std::shared_ptr<VerifiedBlocks const> const& _blocks);
 
 private:
     static char const* const c_stateNames[static_cast<int>(SyncState::Size)];