From 79c3f777aa0d3760343fc8aac2c08acce9d26075 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 8 Jan 2013 01:14:55 -0800 Subject: [PATCH] Memory fixes. --- src/cpp/ripple/Ledger.cpp | 2 +- src/cpp/ripple/LedgerAcquire.cpp | 2 +- src/cpp/ripple/LedgerHistory.cpp | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cpp/ripple/Ledger.cpp b/src/cpp/ripple/Ledger.cpp index c95c13a6a7..2927ce0159 100644 --- a/src/cpp/ripple/Ledger.cpp +++ b/src/cpp/ripple/Ledger.cpp @@ -521,7 +521,7 @@ Ledger::pointer Ledger::getSQL(const std::string& sql) assert(false); return Ledger::pointer(); } - Log(lsDEBUG) << "Loaded ledger: " << ledgerHash; + Log(lsTRACE) << "Loaded ledger: " << ledgerHash; return ret; } diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp index 9f11893afe..ddee47a4cb 100644 --- a/src/cpp/ripple/LedgerAcquire.cpp +++ b/src/cpp/ripple/LedgerAcquire.cpp @@ -745,7 +745,7 @@ void LedgerAcquireMaster::sweep() { if (it->second->getLastAction() > now) it->second->touch(); - else if ((it->second->getLastAction() + 500) < now) + else if ((it->second->getLastAction() + 60) < now) mLedgers.erase(it++); else ++it; diff --git a/src/cpp/ripple/LedgerHistory.cpp b/src/cpp/ripple/LedgerHistory.cpp index 5bea8e9777..159c901688 100644 --- a/src/cpp/ripple/LedgerHistory.cpp +++ b/src/cpp/ripple/LedgerHistory.cpp @@ -10,11 +10,11 @@ #include "Application.h" #ifndef CACHED_LEDGER_NUM -#define CACHED_LEDGER_NUM 128 +#define CACHED_LEDGER_NUM 64 #endif #ifndef CACHED_LEDGER_AGE -#define CACHED_LEDGER_AGE 900 +#define CACHED_LEDGER_AGE 60 #endif // FIXME: Need to clean up ledgers by index at some point @@ -84,6 +84,7 @@ Ledger::pointer LedgerHistory::getLedgerByHash(const uint256& hash) if (!ret) return ret; assert(ret->getHash() == hash); + mLedgersByHash.canonicalize(ret->getHash(), ret); return ret; }