From f29cb461c93d4c90d89a3193813668b9e3a378be Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 7 Jul 2015 08:11:35 -0700 Subject: [PATCH] Tidy up gaurds. Shorted extraData to max size. --- libethereum/BlockChain.cpp | 38 ++++++++++---------------------------- libethereum/State.cpp | 31 ++++++++++++------------------- 2 files changed, 22 insertions(+), 47 deletions(-) diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp index d8dbd266f..207582ba9 100644 --- a/libethereum/BlockChain.cpp +++ b/libethereum/BlockChain.cpp @@ -871,33 +871,21 @@ template static unsigned getHashSize(unordered_map const& _ma void BlockChain::updateStats() const { - { - ReadGuard l(x_blocks); - m_lastStats.memBlocks = 0; + m_lastStats.memBlocks = 0; + DEV_READ_GUARDED(x_blocks) for (auto const& i: m_blocks) m_lastStats.memBlocks += i.second.size() + 64; - } - { - ReadGuard l(x_details); + DEV_READ_GUARDED(x_details) m_lastStats.memDetails = getHashSize(m_details); - } - { - ReadGuard l1(x_logBlooms); - ReadGuard l2(x_blocksBlooms); - m_lastStats.memLogBlooms = getHashSize(m_logBlooms) + getHashSize(m_blocksBlooms); - } - { - ReadGuard l(x_receipts); + DEV_READ_GUARDED(x_logBlooms) + DEV_READ_GUARDED(x_blocksBlooms) + m_lastStats.memLogBlooms = getHashSize(m_logBlooms) + getHashSize(m_blocksBlooms); + DEV_READ_GUARDED(x_receipts) m_lastStats.memReceipts = getHashSize(m_receipts); - } - { - ReadGuard l(x_blockHashes); + DEV_READ_GUARDED(x_blockHashes) m_lastStats.memBlockHashes = getHashSize(m_blockHashes); - } - { - ReadGuard l(x_transactionAddresses); + DEV_READ_GUARDED(x_transactionAddresses) m_lastStats.memTransactionAddresses = getHashSize(m_transactionAddresses); - } } void BlockChain::garbageCollect(bool _force) @@ -954,10 +942,8 @@ void BlockChain::garbageCollect(bool _force) void BlockChain::checkConsistency() { - { - WriteGuard l(x_details); + DEV_WRITE_GUARDED(x_details) m_details.clear(); - } ldb::Iterator* it = m_blocksDB->NewIterator(m_readOptions); for (it->SeekToFirst(); it->Valid(); it->Next()) if (it->key().size() == 32) @@ -969,13 +955,9 @@ void BlockChain::checkConsistency() { auto dp = details(p); if (asserts(contains(dp.children, h))) - { cnote << "Apparently the database is corrupt. Not much we can do at this stage..."; - } if (assertsEqual(dp.number, dh.number - 1)) - { cnote << "Apparently the database is corrupt. Not much we can do at this stage..."; - } } } delete it; diff --git a/libethereum/State.cpp b/libethereum/State.cpp index e1bdd19b6..4326d5cf3 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -445,7 +445,8 @@ u256 State::enactOn(VerifiedBlockRef const& _block, BlockChain const& _bc, Impor #if ETH_TIMED_ENACTMENTS enactment = t.elapsed(); - cnote << "popVer/popGrand/syncReset/enactment = " << populateVerify << "/" << populateGrand << "/" << syncReset << "/" << enactment; + if (populateVerify + populateGrand + syncReset + enactment > 0.5) + clog(StateChat) << "popVer/popGrand/syncReset/enactment = " << populateVerify << "/" << populateGrand << "/" << syncReset << "/" << enactment; #endif return ret; } @@ -513,18 +514,17 @@ pair State::sync(BlockChain const& _bc, TransactionQu { if (t.gasPrice() >= _gp.ask(*this)) { - // Timer t; +// Timer t; if (lh.empty()) lh = _bc.lastHashes(); execute(lh, t); ret.first.push_back(m_receipts.back()); ++goodTxs; - // cnote << "TX took:" << t.elapsed() * 1000; +// cnote << "TX took:" << t.elapsed() * 1000; } else if (t.gasPrice() < _gp.ask(*this) * 9 / 10) { - // less than 90% of our ask price for gas. drop. - cnote << t.sha3() << "Dropping El Cheapo transaction (<90% of ask price)"; + clog(StateTrace) << t.sha3() << "Dropping El Cheapo transaction (<90% of ask price)"; _tq.drop(t.sha3()); } } @@ -536,22 +536,13 @@ pair State::sync(BlockChain const& _bc, TransactionQu if (req > got) { // too old -/* for (Transaction const& mt: m_transactions) - { - if (mt.from() == t.from()) - { - if (mt.nonce() < t.nonce()) - cnote << t.sha3() << "Dropping old transaction (nonce too low)"; - else if (mt.nonce() == t.nonce() && mt.gasPrice() <= t.gasPrice()) - cnote << t.sha3() << "Dropping old transaction (gas price lower)"; - } - }*/ + clog(StateTrace) << t.sha3() << "Dropping old transaction (nonce too low)"; _tq.drop(t.sha3()); } else if (got > req + _tq.waiting(t.sender())) { // too new - cnote << t.sha3() << "Dropping new transaction (too many nonces ahead)"; + clog(StateTrace) << t.sha3() << "Dropping new transaction (too many nonces ahead)"; _tq.drop(t.sha3()); } else @@ -562,7 +553,7 @@ pair State::sync(BlockChain const& _bc, TransactionQu bigint const& got = *boost::get_error_info(e); if (got > m_currentBlock.gasLimit) { - cnote << t.sha3() << "Dropping over-gassy transaction (gas > block's gas limit)"; + clog(StateTrace) << t.sha3() << "Dropping over-gassy transaction (gas > block's gas limit)"; _tq.drop(t.sha3()); } else @@ -576,14 +567,14 @@ pair State::sync(BlockChain const& _bc, TransactionQu catch (Exception const& _e) { // Something else went wrong - drop it. - cnote << t.sha3() << "Dropping invalid transaction:" << diagnostic_information(_e); + clog(StateTrace) << t.sha3() << "Dropping invalid transaction:" << diagnostic_information(_e); _tq.drop(t.sha3()); } catch (std::exception const&) { // Something else went wrong - drop it. _tq.drop(t.sha3()); - cnote << t.sha3() << "Transaction caused low-level exception :("; + cwarn << t.sha3() << "Transaction caused low-level exception :("; } } if (chrono::steady_clock::now() > deadline) @@ -965,6 +956,8 @@ void State::commitToMine(BlockChain const& _bc, bytes const& _extraData) m_currentBlock.stateRoot = m_state.root(); m_currentBlock.parentHash = m_previousBlock.hash(); m_currentBlock.extraData = _extraData; + if (m_currentBlock.extraData.size() > 32) + m_currentBlock.extraData.resize(32); m_committedToMine = true; }