From 7ba71da2806ac8e9fbf58b65bc6435660a3c4b0b Mon Sep 17 00:00:00 2001 From: arkpar Date: Wed, 1 Jul 2015 11:47:34 +0200 Subject: [PATCH] style --- libethereum/BlockQueue.cpp | 8 ++++---- libethereum/BlockQueue.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libethereum/BlockQueue.cpp b/libethereum/BlockQueue.cpp index 30ae65ed2..344ee0609 100644 --- a/libethereum/BlockQueue.cpp +++ b/libethereum/BlockQueue.cpp @@ -127,7 +127,7 @@ void BlockQueue::verifierBody() } cwarn << "BlockQueue missing our job: was there a GM?"; OK1:; - drainVerified(); + drainVerified_WITH_BOTH_LOCKS(); continue; } @@ -147,7 +147,7 @@ void BlockQueue::verifierBody() else m_verified.emplace_back(move(res)); - drainVerified(); + drainVerified_WITH_BOTH_LOCKS(); ready = true; } else @@ -167,9 +167,9 @@ void BlockQueue::verifierBody() } } -void BlockQueue::drainVerified() +void BlockQueue::drainVerified_WITH_BOTH_LOCKS() { - while (m_verifying.size() && !m_verifying.front().blockData.empty()) + while (!m_verifying.empty() && !m_verifying.front().blockData.empty()) { if (m_knownBad.count(m_verifying.front().verified.info.parentHash)) { diff --git a/libethereum/BlockQueue.h b/libethereum/BlockQueue.h index 82547cd56..18446c613 100644 --- a/libethereum/BlockQueue.h +++ b/libethereum/BlockQueue.h @@ -134,7 +134,7 @@ private: bool invariants() const override; void verifierBody(); - void drainVerified(); + void drainVerified_WITH_BOTH_LOCKS(); void collectUnknownBad(h256 const& _bad); void updateBad(h256 const& _bad);