Devirtualize HashRouter

* Include some simple renames
This commit is contained in:
Edward Hennis
2015-08-04 15:38:30 -04:00
committed by Nik Bougalis
parent d69285f6ad
commit 0d7cad8d64
17 changed files with 141 additions and 170 deletions

View File

@@ -35,7 +35,7 @@
#include <ripple/app/main/LocalCredentials.h>
#include <ripple/app/main/NodeStoreScheduler.h>
#include <ripple/app/misc/AmendmentTable.h>
#include <ripple/app/misc/IHashRouter.h>
#include <ripple/app/misc/HashRouter.h>
#include <ripple/app/misc/NetworkOPs.h>
#include <ripple/app/misc/SHAMapStore.h>
#include <ripple/app/misc/Validations.h>
@@ -292,7 +292,7 @@ public:
std::unique_ptr <ServerHandler> serverHandler_;
std::unique_ptr <AmendmentTable> m_amendmentTable;
std::unique_ptr <LoadFeeTrack> mFeeTrack;
std::unique_ptr <IHashRouter> mHashRouter;
std::unique_ptr <HashRouter> mHashRouter;
std::unique_ptr <Validations> mValidations;
std::unique_ptr <LoadManager> m_loadManager;
beast::DeadlineTimer m_sweepTimer;
@@ -411,7 +411,8 @@ public:
, mFeeTrack (std::make_unique<LoadFeeTrack>(m_logs.journal("LoadManager")))
, mHashRouter (IHashRouter::New (IHashRouter::getDefaultHoldTime ()))
, mHashRouter (std::make_unique<HashRouter>(
HashRouter::getDefaultHoldTime ()))
, mValidations (make_Validations ())
@@ -574,7 +575,7 @@ public:
return *mFeeTrack;
}
IHashRouter& getHashRouter ()
HashRouter& getHashRouter ()
{
return *mHashRouter;
}
@@ -1325,7 +1326,7 @@ bool ApplicationImp::loadOldLedger (
cur->rawTxInsert(item.key(),
std::make_shared<Serializer const>(
std::move(s)), nullptr);
getApp().getHashRouter().setFlag (item.key(), SF_SIGGOOD);
getApp().getHashRouter().setFlags (item.key(), SF_SIGGOOD);
}
// Switch to the mutable snapshot