Remove old uptime stuff

This commit is contained in:
Vinnie Falco
2013-05-25 11:24:17 -07:00
parent 794b84c473
commit 55c39b7131

View File

@@ -10,21 +10,15 @@
SETUP_LOG (LoadManager) SETUP_LOG (LoadManager)
/* LoadManager::LoadManager (int creditRate, int creditLimit, int debitWarn, int debitLimit)
static volatile int* uptimePtr = NULL; : mCreditRate(creditRate)
, mCreditLimit(creditLimit)
int upTime() , mDebitWarn(debitWarn)
{ , mDebitLimit(debitLimit)
static time_t firstCall = time(NULL); , mShutdown(false)
if (uptimePtr != NULL) , mArmed(false)
return *uptimePtr; , mDeadLock(0)
return static_cast<int>(time(NULL) - firstCall); , mCosts(LT_MAX)
}
*/
LoadManager::LoadManager(int creditRate, int creditLimit, int debitWarn, int debitLimit) :
mCreditRate(creditRate), mCreditLimit(creditLimit), mDebitWarn(debitWarn), mDebitLimit(debitLimit),
mShutdown(false), mArmed(false), /*mUptime(0),*/ mDeadLock(0), mCosts(LT_MAX)
{ {
addLoadCost(LoadCost(LT_InvalidRequest, -10, LC_CPU | LC_Network)); addLoadCost(LoadCost(LT_InvalidRequest, -10, LC_CPU | LC_Network));
addLoadCost(LoadCost(LT_RequestNoReply, -1, LC_CPU | LC_Disk)); addLoadCost(LoadCost(LT_RequestNoReply, -1, LC_CPU | LC_Disk));
@@ -43,10 +37,6 @@ LoadManager::LoadManager(int creditRate, int creditLimit, int debitWarn, int deb
void LoadManager::init() void LoadManager::init()
{ {
/*
if (uptimePtr == NULL)
uptimePtr = static_cast<volatile int *>(&mUptime);
*/
UptimeTimer::getInstance().beginManualUpdates (); UptimeTimer::getInstance().beginManualUpdates ();
boost::thread(boost::bind(&LoadManager::threadEntry, this)).detach(); boost::thread(boost::bind(&LoadManager::threadEntry, this)).detach();
@@ -54,10 +44,6 @@ void LoadManager::init()
LoadManager::~LoadManager() LoadManager::~LoadManager()
{ {
/*
if (uptimePtr == &mUptime)
uptimePtr = NULL;
*/
UptimeTimer::getInstance().endManualUpdates (); UptimeTimer::getInstance().endManualUpdates ();
do do
@@ -351,7 +337,6 @@ void LoadManager::threadEntry()
return; return;
} }
//++mUptime;
UptimeTimer::getInstance ().incrementElapsedTime (); UptimeTimer::getInstance ().incrementElapsedTime ();
int dlTime = UptimeTimer::getInstance ().getElapsedSeconds () - mDeadLock; int dlTime = UptimeTimer::getInstance ().getElapsedSeconds () - mDeadLock;