From 7c346c8d4ac82b1412c92cdb8ff487d5a0b8ed69 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 1 Nov 2012 08:46:04 -0700
Subject: [PATCH] Count some more class instances.

---
 src/LedgerAcquire.cpp   | 1 +
 src/LedgerAcquire.h     | 5 ++++-
 src/LedgerConsensus.cpp | 1 +
 src/LedgerConsensus.h   | 5 ++++-
 src/LedgerEntrySet.cpp  | 2 ++
 src/LedgerEntrySet.h    | 8 ++++++--
 src/LedgerHistory.cpp   | 3 +++
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp
index ca26c885c..a9c4cf8ca 100644
--- a/src/LedgerAcquire.cpp
+++ b/src/LedgerAcquire.cpp
@@ -11,6 +11,7 @@
 #include "HashPrefixes.h"
 
 SETUP_LOG();
+DECLARE_INSTANCE(PeerSet);
 
 #define LA_DEBUG
 #define LEDGER_ACQUIRE_TIMEOUT 750
diff --git a/src/LedgerAcquire.h b/src/LedgerAcquire.h
index 6044d1047..2dcf01885 100644
--- a/src/LedgerAcquire.h
+++ b/src/LedgerAcquire.h
@@ -14,9 +14,12 @@
 #include "Ledger.h"
 #include "Peer.h"
 #include "TaggedCache.h"
+#include "InstanceCounter.h"
 #include "../obj/src/ripple.pb.h"
 
-class PeerSet
+DEFINE_INSTANCE(PeerSet);
+
+class PeerSet : private IS_INSTANCE(PeerSet)
 {
 protected:
 	uint256 mHash;
diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index 9f55c2243..15e439784 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -24,6 +24,7 @@ typedef std::pair<const uint160, LedgerProposal::pointer> u160_prop_pair;
 typedef std::pair<const uint256, LCTransaction::pointer> u256_lct_pair;
 
 SETUP_LOG();
+DECLARE_INSTANCE(LedgerConsensus);
 
 TransactionAcquire::TransactionAcquire(const uint256& hash) : PeerSet(hash, TX_ACQUIRE_TIMEOUT), mHaveRoot(false)
 {
diff --git a/src/LedgerConsensus.h b/src/LedgerConsensus.h
index 38a2dde9f..6eae25750 100644
--- a/src/LedgerConsensus.h
+++ b/src/LedgerConsensus.h
@@ -17,6 +17,9 @@
 #include "Peer.h"
 #include "CanonicalTXSet.h"
 #include "TransactionEngine.h"
+#include "InstanceCounter.h"
+
+DEFINE_INSTANCE(LedgerConsensus);
 
 class TransactionAcquire : public PeerSet, public boost::enable_shared_from_this<TransactionAcquire>
 { // A transaction set we are trying to acquire
@@ -78,7 +81,7 @@ enum LCState
 	lcsACCEPTED,		// We have accepted/validated a new last closed ledger
 };
 
-class LedgerConsensus : public boost::enable_shared_from_this<LedgerConsensus>
+class LedgerConsensus : public boost::enable_shared_from_this<LedgerConsensus>, IS_INSTANCE(LedgerConsensus)
 {
 protected:
 	LCState mState;
diff --git a/src/LedgerEntrySet.cpp b/src/LedgerEntrySet.cpp
index bdf3958b0..9834e3ff7 100644
--- a/src/LedgerEntrySet.cpp
+++ b/src/LedgerEntrySet.cpp
@@ -7,6 +7,8 @@
 #include "Log.h"
 
 SETUP_LOG();
+DECLARE_INSTANCE(LedgerEntrySetEntry);
+DECLARE_INSTANCE(LedgerEntrySet)
 
 // #define META_DEBUG
 
diff --git a/src/LedgerEntrySet.h b/src/LedgerEntrySet.h
index 1554ab89e..51c61b269 100644
--- a/src/LedgerEntrySet.h
+++ b/src/LedgerEntrySet.h
@@ -7,6 +7,10 @@
 #include "TransactionMeta.h"
 #include "Ledger.h"
 #include "TransactionErr.h"
+#include "InstanceCounter.h"
+
+DEFINE_INSTANCE(LedgerEntrySetEntry);
+DEFINE_INSTANCE(LedgerEntrySet);
 
 enum LedgerEntryAction
 {
@@ -17,7 +21,7 @@ enum LedgerEntryAction
 	taaCREATE,	// Newly created.
 };
 
-class LedgerEntrySetEntry
+class LedgerEntrySetEntry : private IS_INSTANCE(LedgerEntrySetEntry)
 {
 public:
 	SLE::pointer		mEntry;
@@ -28,7 +32,7 @@ public:
 };
 
 
-class LedgerEntrySet
+class LedgerEntrySet : private IS_INSTANCE(LedgerEntrySet)
 {
 protected:
 	Ledger::pointer mLedger;
diff --git a/src/LedgerHistory.cpp b/src/LedgerHistory.cpp
index dcecab9bf..6fb5f1248 100644
--- a/src/LedgerHistory.cpp
+++ b/src/LedgerHistory.cpp
@@ -9,6 +9,9 @@
 #include "Config.h"
 #include "Application.h"
 
+#define CACHED_LEDGER_NUM 3 // TEMPORARY REMOVEME FIXME
+#define CACHED_LEDGER_AGE 60 // TEMPORARY REMOVEME FIXME
+
 #ifndef CACHED_LEDGER_NUM
 #define CACHED_LEDGER_NUM 512
 #endif