ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::atomic

Browse Source
This commit is contained in:
Nik Bougalis
2014-07-28 15:33:57 -07:00
committed by Tom Ritchford
parent c24a497a23
commit b43832fe57
9 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ripple/module/app/ledger/InboundLedger.cpp
View File

@@ -69,7 +69,7 @@ InboundLedger::~InboundLedger ()
{
// Save any received AS data not processed. It could be useful
// for populating a different ledger
BOOST_FOREACH (PeerDataPairType& entry, mReceivedData)
for (auto& entry : mReceivedData)
{
if (entry.second->type () == protocol::liAS_NODE)
getApp().getInboundLedgers().gotStaleData(entry.second);
@@ -164,8 +164,7 @@ bool InboundLedger::tryLocal ()
if (mLedger->peekTransactionMap ()->fetchRoot (
mLedger->getTransHash (), &filter))
{
std::vector<uint256> h (mLedger->getNeededTransactionHashes (
1, &filter));
auto h (mLedger->getNeededTransactionHashes (1, &filter));
if (h.empty ())
{
@@ -193,8 +192,7 @@ bool InboundLedger::tryLocal ()
if (mLedger->peekAccountStateMap ()->fetchRoot (
mLedger->getAccountHash (), &filter))
{
std::vector<uint256> h (mLedger->getNeededAccountStateHashes (
1, &filter));
auto h (mLedger->getNeededAccountStateHashes (1, &filter));
if (h.empty ())
{
@@ -459,7 +457,7 @@ void InboundLedger::trigger (Peer::ptr const& peer)
if (!isProgress () && !mFailed && mByHash && (
getTimeouts () > ledgerBecomeAggressiveThreshold))
{
std::vector<neededHash_t> need = getNeededHashes ();
auto need = getNeededHashes ();
if (!need.empty ())
{
@@ -467,7 +465,7 @@ void InboundLedger::trigger (Peer::ptr const& peer)
tmBH.set_query (true);
tmBH.set_ledgerhash (mHash.begin (), mHash.size ());
bool typeSet = false;
BOOST_FOREACH (neededHash_t & p, need)
for (auto& p : need)
{
if (m_journal.warning) m_journal.warning
<< "Want: " << p.second;
@@ -1009,9 +1007,7 @@ std::vector<InboundLedger::neededHash_t> InboundLedger::getNeededHashes ()
{
AccountStateSF filter (mLedger->getLedgerSeq ());
// VFALCO NOTE What's the number 4?
std::vector<uint256> v = mLedger->getNeededAccountStateHashes (
4, &filter);
BOOST_FOREACH (uint256 const & h, v)
for (auto const& h : mLedger->getNeededAccountStateHashes (4, &filter))
{
ret.push_back (std::make_pair (
protocol::TMGetObjectByHash::otSTATE_NODE, h));
@@ -1022,9 +1018,7 @@ std::vector<InboundLedger::neededHash_t> InboundLedger::getNeededHashes ()
{
TransactionStateSF filter (mLedger->getLedgerSeq ());
// VFALCO NOTE What's the number 4?
std::vector<uint256> v = mLedger->getNeededTransactionHashes (
4, &filter);
BOOST_FOREACH (uint256 const & h, v)
for (auto const& h : mLedger->getNeededTransactionHashes (4, &filter))
{
ret.push_back (std::make_pair (
protocol::TMGetObjectByHash::otTRANSACTION_NODE, h));
@@ -1198,7 +1192,7 @@ void InboundLedger::runData ()
// Select the peer that gives us the most nodes that are useful,
// breaking ties in favor of the peer that responded first.
BOOST_FOREACH (PeerDataPairType& entry, data)
for (auto& entry : data)
{
Peer::ptr peer = entry.first.lock();
if (peer)
@@ -1257,7 +1251,6 @@ Json::Value InboundLedger::getJson (int)
// VFALCO Why 16?
auto v = mLedger->getNeededAccountStateHashes (16, nullptr);
for (auto const& h : v)
{
hv.append (to_string (h));
@@ -1270,7 +1263,6 @@ Json::Value InboundLedger::getJson (int)
Json::Value hv (Json::arrayValue);
// VFALCO Why 16?
auto v = mLedger->getNeededTransactionHashes (16, nullptr);
for (auto const& h : v)
{
hv.append (to_string (h));