Replace InstanceCounter with CountedObject

This commit is contained in:
Vinnie Falco
2013-06-17 17:45:33 -07:00
parent abce930b8b
commit 2abec05b5b
53 changed files with 321 additions and 334 deletions

View File

@@ -2401,12 +2401,14 @@ Json::Value RPCHandler::doGetCounts (Json::Value jvRequest, int& cost, ScopedLoc
if (jvRequest.isMember ("min_count"))
minCount = jvRequest["min_count"].asUInt ();
std::vector<InstanceType::InstanceCount> count = InstanceType::getInstanceCounts (minCount);
CountedObjects::List objectCounts = CountedObjects::getInstance ().getCounts (minCount);
Json::Value ret (Json::objectValue);
BOOST_FOREACH (InstanceType::InstanceCount & it, count)
ret[it.first] = it.second;
BOOST_FOREACH (CountedObjects::Entry& it, objectCounts)
{
ret [it.first] = it.second;
}
int dbKB = theApp->getLedgerDB ()->getDB ()->getKBUsedAll ();