Remove legacy LoadTypes (RIPD-365)

This commit is contained in:
Nik Bougalis
2014-11-24 22:40:30 -08:00
parent d26fae9875
commit 91ce7807b9
8 changed files with 12 additions and 196 deletions

View File

@@ -19,7 +19,7 @@
#include <ripple/basics/UptimeTimer.h>
#include <ripple/core/LoadFeeTrack.h>
#include <ripple/resource/LegacyFees.h>
#include <beast/cxx14/memory.h> // <memory>
namespace ripple {
@@ -28,51 +28,6 @@ class LoadManagerImp
, public beast::Thread
{
public:
/* Entry mapping utilization to cost.
The cost is expressed as a unitless relative quantity. These
mappings are statically loaded at startup with heuristic values.
*/
class Cost
{
public:
// VFALCO TODO Eliminate this default ctor somehow
Cost ()
: m_loadType ()
, m_cost (0)
, m_resourceFlags (0)
{
}
Cost (LoadType loadType, int cost, int resourceFlags)
: m_loadType (loadType)
, m_cost (cost)
, m_resourceFlags (resourceFlags)
{
}
LoadType getLoadType () const
{
return m_loadType;
}
int getCost () const
{
return m_cost;
}
int getResourceFlags () const
{
return m_resourceFlags;
}
public:
// VFALCO TODO Make these private and const
LoadType m_loadType;
int m_cost;
int m_resourceFlags;
};
//--------------------------------------------------------------------------
beast::Journal m_journal;
@@ -83,9 +38,6 @@ public:
bool mArmed;
int mDeadLock; // Detect server deadlocks
std::vector <Cost> mCosts;
//--------------------------------------------------------------------------
LoadManagerImp (Stoppable& parent, beast::Journal journal)
@@ -94,7 +46,6 @@ public:
, m_journal (journal)
, mArmed (false)
, mDeadLock (0)
, mCosts (LT_MAX)
{
UptimeTimer::getInstance ().beginManualUpdates ();
}
@@ -208,7 +159,8 @@ public:
// Another option is using an observer pattern to invert the dependency.
if (getApp().getJobQueue ().isOverloaded ())
{
m_journal.info << getApp().getJobQueue ().getJson (0);
if (m_journal.info)
m_journal.info << getApp().getJobQueue ().getJson (0);
change = getApp().getFeeTrack ().raiseLocalFee ();
}
else
@@ -249,9 +201,10 @@ LoadManager::LoadManager (Stoppable& parent)
//------------------------------------------------------------------------------
LoadManager* LoadManager::New (Stoppable& parent, beast::Journal journal)
std::unique_ptr<LoadManager>
make_LoadManager (beast::Stoppable& parent, beast::Journal journal)
{
return new LoadManagerImp (parent, journal);
return std::make_unique <LoadManagerImp> (parent, journal);
}
} // ripple