ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use boost::circular_buffer:

Browse Source 
The existing code used std::deque along with a size check to constrain the
size of a buffer and, effectively, "hand rolled" a circular buffer. This
change simply migrates directly to boost::circular_buffer.
This commit is contained in:
Nik Bougalis
2020-05-12 17:23:30 -07:00
committed by manojsdoshi
parent 9f91870b1c
commit 3936110c8d
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -1961,9 +1961,6 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactionSet> const& m)
return; return;
} }
if (recentTxSets_.size() == 128)
recentTxSets_.pop_front();
recentTxSets_.push_back(hash); recentTxSets_.push_back(hash);
} }
} }
@@ -2324,11 +2321,6 @@ PeerImp::addLedger(
recentLedgers_.end()) recentLedgers_.end())
return; return;
// VFALCO TODO See if a sorted vector would be better.
if (recentLedgers_.size() == 128)
recentLedgers_.pop_front();
recentLedgers_.push_back(hash); recentLedgers_.push_back(hash);
} }

16
src/ripple/overlay/impl/PeerImp.h
View File

@@ -37,7 +37,6 @@
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <cstdint> #include <cstdint>
#include <deque>
#include <queue> #include <queue>
#include <shared_mutex> #include <shared_mutex>
@@ -134,8 +133,9 @@ private:
LedgerIndex maxLedger_ = 0; LedgerIndex maxLedger_ = 0;
uint256 closedLedgerHash_; uint256 closedLedgerHash_;
uint256 previousLedgerHash_; uint256 previousLedgerHash_;
std::deque<uint256> recentLedgers_;
std::deque<uint256> recentTxSets_; boost::circular_buffer<uint256> recentLedgers_{128};
boost::circular_buffer<uint256> recentTxSets_{128};
boost::optional<std::chrono::milliseconds> latency_; boost::optional<std::chrono::milliseconds> latency_;
boost::optional<std::uint32_t> lastPingSeq_; boost::optional<std::uint32_t> lastPingSeq_;
@@ -495,13 +495,6 @@ public:
// //
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
static error_code
invalid_argument_error()
{
return boost::system::errc::make_error_code(
boost::system::errc::invalid_argument);
}
void void
onMessageUnknown(std::uint16_t type); onMessageUnknown(std::uint16_t type);
@@ -565,9 +558,6 @@ private:
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
void
setLedgerState();
// lockedRecentLock is passed as a reminder to callers that recentLock_ // lockedRecentLock is passed as a reminder to callers that recentLock_
// must be locked. // must be locked.
void void