ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 14:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up NetworkOPs deadline timer usage

Browse Source
This commit is contained in:
Vinnie Falco
2013-07-10 15:45:36 -07:00
parent ecc864ac8e
commit aeae0fcf11
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -40,14 +40,8 @@ NetworkOPs::NetworkOPs (LedgerMaster* pLedgerMaster)
{ {
} }
void NetworkOPs::onDeadlineTimer (DeadlineTimer& timer) void NetworkOPs::processNetTimer ()
{ {
if (timer == m_clusterTimer)
{
doClusterReport();
return;
}
ScopedLock sl (getApp().getMasterLock ()); ScopedLock sl (getApp().getMasterLock ());
getApp().getLoadManager ().resetDeadlockDetector (); getApp().getLoadManager ().resetDeadlockDetector ();
@@ -91,6 +85,18 @@ void NetworkOPs::onDeadlineTimer (DeadlineTimer& timer)
mConsensus->timerEntry (); mConsensus->timerEntry ();
} }
void NetworkOPs::onDeadlineTimer (DeadlineTimer& timer)
{
if (timer == m_netTimer)
{
processNetTimer ();
}
else if (timer == m_clusterTimer)
{
doClusterReport();
}
}
std::string NetworkOPs::strOperatingMode () std::string NetworkOPs::strOperatingMode ()
{ {
static const char* paStatusToken [] = static const char* paStatusToken [] =
@@ -635,6 +641,7 @@ void NetworkOPs::setFeatureBlocked ()
void NetworkOPs::setStateTimer () void NetworkOPs::setStateTimer ()
{ {
m_netTimer.setRecurringExpiration (LEDGER_GRANULARITY / 1000.0); m_netTimer.setRecurringExpiration (LEDGER_GRANULARITY / 1000.0);
m_clusterTimer.setRecurringExpiration (10.0); m_clusterTimer.setRecurringExpiration (10.0);
} }

3
src/cpp/ripple/NetworkOPs.h
View File

@@ -361,7 +361,8 @@ public:
InfoSub::pointer addRpcSub (const std::string& strUrl, InfoSub::ref rspEntry); InfoSub::pointer addRpcSub (const std::string& strUrl, InfoSub::ref rspEntry);
private: private:
void onDeadlineTimer (DeadlineTimer&); void processNetTimer ();
void onDeadlineTimer (DeadlineTimer& timer);
void setMode (OperatingMode); void setMode (OperatingMode);