diff --git a/modules/ripple_basics/utility/ripple_CountedObject.h b/modules/ripple_basics/utility/ripple_CountedObject.h index 6cde850597..8aca24a5a5 100644 --- a/modules/ripple_basics/utility/ripple_CountedObject.h +++ b/modules/ripple_basics/utility/ripple_CountedObject.h @@ -101,6 +101,8 @@ public: getCounter ().decrement (); } + virtual char const* getCountedObjectName () = 0; + private: class Counter : public CountedObjects::CounterBase { diff --git a/modules/ripple_data/protocol/ripple_SerializedObject.h b/modules/ripple_data/protocol/ripple_SerializedObject.h index bcc4fd426a..7fd24396e0 100644 --- a/modules/ripple_data/protocol/ripple_SerializedObject.h +++ b/modules/ripple_data/protocol/ripple_SerializedObject.h @@ -12,6 +12,8 @@ class STObject , public CountedObject { public: + char const* getCountedObjectName () { return "STObject"; } + STObject () : mType (NULL) { ; @@ -323,6 +325,8 @@ class STArray , public CountedObject { public: + char const* getCountedObjectName () { return "STArray"; } + typedef boost::ptr_vector vector; typedef boost::ptr_vector::iterator iterator; typedef boost::ptr_vector::const_iterator const_iterator; diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h index f39c03762c..22a97babb6 100644 --- a/src/cpp/ripple/Ledger.h +++ b/src/cpp/ripple/Ledger.h @@ -41,6 +41,8 @@ class Ledger , public CountedObject { public: + char const* getCountedObjectName () { return "Ledger"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/LedgerProposal.h b/src/cpp/ripple/LedgerProposal.h index 072c2cc50f..2e4228bc0c 100644 --- a/src/cpp/ripple/LedgerProposal.h +++ b/src/cpp/ripple/LedgerProposal.h @@ -11,6 +11,8 @@ class LedgerProposal : public CountedObject { public: + char const* getCountedObjectName () { return "LedgerProposal"; } + static const uint32 seqLeave = 0xffffffff; // leaving the consensus process typedef boost::shared_ptr pointer; diff --git a/src/cpp/ripple/SerializedValidation.h b/src/cpp/ripple/SerializedValidation.h index a04fd16df4..67ce0a771b 100644 --- a/src/cpp/ripple/SerializedValidation.h +++ b/src/cpp/ripple/SerializedValidation.h @@ -12,6 +12,8 @@ class SerializedValidation , public CountedObject { public: + char const* getCountedObjectName () { return "SerializedValidation"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/Transaction.h b/src/cpp/ripple/Transaction.h index 9543b177b4..bb40b1ee16 100644 --- a/src/cpp/ripple/Transaction.h +++ b/src/cpp/ripple/Transaction.h @@ -32,6 +32,8 @@ class Transaction , public CountedObject { public: + char const* getCountedObjectName () { return "Transaction"; } + typedef boost::shared_ptr pointer; typedef const pointer& ref; diff --git a/src/cpp/ripple/TransactionEngine.h b/src/cpp/ripple/TransactionEngine.h index 6d45bbb14f..6cb63832e8 100644 --- a/src/cpp/ripple/TransactionEngine.h +++ b/src/cpp/ripple/TransactionEngine.h @@ -15,6 +15,9 @@ class TransactionEngine : public CountedObject { +public: + char const* getCountedObjectName () { return "TransactionEngine"; } + private: LedgerEntrySet mNodes; diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h index fbfa63aa9b..9b0da61e05 100644 --- a/src/cpp/ripple/WSConnection.h +++ b/src/cpp/ripple/WSConnection.h @@ -24,6 +24,8 @@ class WSConnection , public CountedObject > { public: + char const* getCountedObjectName () { return "WSConnection"; } + typedef typename endpoint_type::connection_type connection; typedef typename boost::shared_ptr connection_ptr; typedef typename boost::weak_ptr weak_connection_ptr; diff --git a/src/cpp/ripple/ripple_HashRouter.cpp b/src/cpp/ripple/ripple_HashRouter.cpp index 22cbea8d91..5772aaedcf 100644 --- a/src/cpp/ripple/ripple_HashRouter.cpp +++ b/src/cpp/ripple/ripple_HashRouter.cpp @@ -13,6 +13,8 @@ private: class Entry : public CountedObject { public: + char const* getCountedObjectName () { return "HashRouterEntry"; } + Entry () : mFlags (0) { diff --git a/src/cpp/ripple/ripple_HashedObject.h b/src/cpp/ripple/ripple_HashedObject.h index 5760f27599..4162a7cb36 100644 --- a/src/cpp/ripple/ripple_HashedObject.h +++ b/src/cpp/ripple/ripple_HashedObject.h @@ -36,6 +36,8 @@ class HashedObject : public CountedObject { public: + char const* getCountedObjectName () { return "HashedObject"; } + typedef boost::shared_ptr pointer; typedef pointer const& ref; diff --git a/src/cpp/ripple/ripple_InboundLedger.h b/src/cpp/ripple/ripple_InboundLedger.h index 6768508cc8..bc902a661f 100644 --- a/src/cpp/ripple/ripple_InboundLedger.h +++ b/src/cpp/ripple/ripple_InboundLedger.h @@ -15,6 +15,8 @@ class InboundLedger , public CountedObject { public: + char const* getCountedObjectName () { return "InboundLedger"; } + typedef boost::shared_ptr pointer; public: diff --git a/src/cpp/ripple/ripple_InfoSub.h b/src/cpp/ripple/ripple_InfoSub.h index 3b926870f8..11439817af 100644 --- a/src/cpp/ripple/ripple_InfoSub.h +++ b/src/cpp/ripple/ripple_InfoSub.h @@ -16,6 +16,8 @@ class InfoSub : public CountedObject { public: + char const* getCountedObjectName () { return "InfoSub"; } + typedef boost::shared_ptr pointer; // VFALCO TODO Standardize on the names of weak / strong pointer typedefs. diff --git a/src/cpp/ripple/ripple_LedgerConsensus.h b/src/cpp/ripple/ripple_LedgerConsensus.h index 56f1e76c75..4c4f74aa51 100644 --- a/src/cpp/ripple/ripple_LedgerConsensus.h +++ b/src/cpp/ripple/ripple_LedgerConsensus.h @@ -17,6 +17,8 @@ class LedgerConsensus , public CountedObject { public: + char const* getCountedObjectName () { return "LedgerConsensus"; } + LedgerConsensus (LedgerHash const & prevLCLHash, Ledger::ref previousLedger, uint32 closeTime); int startup (); diff --git a/src/cpp/ripple/ripple_LedgerEntrySet.h b/src/cpp/ripple/ripple_LedgerEntrySet.h index 1b2cc55a82..6bc750f8d9 100644 --- a/src/cpp/ripple/ripple_LedgerEntrySet.h +++ b/src/cpp/ripple/ripple_LedgerEntrySet.h @@ -36,6 +36,8 @@ class LedgerEntrySetEntry : public CountedObject { public: + char const* getCountedObjectName () { return "LedgerEntrySetEntry"; } + SLE::pointer mEntry; LedgerEntryAction mAction; int mSeq; @@ -60,6 +62,8 @@ class LedgerEntrySet : public CountedObject { public: + char const* getCountedObjectName () { return "LedgerEntrySet"; } + LedgerEntrySet (Ledger::ref ledger, TransactionEngineParams tep, bool immutable = false) : mLedger (ledger), mParams (tep), mSeq (0), mImmutable (immutable) { diff --git a/src/cpp/ripple/ripple_Peer.cpp b/src/cpp/ripple/ripple_Peer.cpp index ffb26889e1..77b372f0b6 100644 --- a/src/cpp/ripple/ripple_Peer.cpp +++ b/src/cpp/ripple/ripple_Peer.cpp @@ -24,6 +24,8 @@ class PeerImp : public Peer , public CountedObject { public: + char const* getCountedObjectName () { return "Peer"; } + PeerImp (boost::asio::io_service & io_service, boost::asio::ssl::context & ctx, uint64 peerId, diff --git a/src/cpp/ripple/ripple_SHAMap.h b/src/cpp/ripple/ripple_SHAMap.h index 0ad68daa7f..c505483245 100644 --- a/src/cpp/ripple/ripple_SHAMap.h +++ b/src/cpp/ripple/ripple_SHAMap.h @@ -20,6 +20,8 @@ class SHAMap : public CountedObject { public: + char const* getCountedObjectName () { return "SHAMap"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/ripple_SHAMapItem.h b/src/cpp/ripple/ripple_SHAMapItem.h index 3cfdbd5e3e..c8759a201b 100644 --- a/src/cpp/ripple/ripple_SHAMapItem.h +++ b/src/cpp/ripple/ripple_SHAMapItem.h @@ -12,6 +12,8 @@ class SHAMapItem : public CountedObject { public: + char const* getCountedObjectName () { return "SHAMapItem"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.h b/src/cpp/ripple/ripple_SHAMapTreeNode.h index 44705dd498..8034b719bc 100644 --- a/src/cpp/ripple/ripple_SHAMapTreeNode.h +++ b/src/cpp/ripple/ripple_SHAMapTreeNode.h @@ -21,6 +21,8 @@ class SHAMapTreeNode , public CountedObject { public: + char const* getCountedObjectName () { return "SHAMapTreeNode"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/ripple_SerializedLedger.h b/src/cpp/ripple/ripple_SerializedLedger.h index 37984b0ae1..fbff0bbf43 100644 --- a/src/cpp/ripple/ripple_SerializedLedger.h +++ b/src/cpp/ripple/ripple_SerializedLedger.h @@ -27,6 +27,8 @@ class SerializedLedgerEntry , public CountedObject { public: + char const* getCountedObjectName () { return "SerializedLedgerEntry"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/ripple_SerializedTransaction.h b/src/cpp/ripple/ripple_SerializedTransaction.h index dd17e293f6..c70b73e783 100644 --- a/src/cpp/ripple/ripple_SerializedTransaction.h +++ b/src/cpp/ripple/ripple_SerializedTransaction.h @@ -21,6 +21,8 @@ class SerializedTransaction , public CountedObject { public: + char const* getCountedObjectName () { return "SerializedTransaction"; } + typedef boost::shared_ptr pointer; typedef const boost::shared_ptr& ref; diff --git a/src/cpp/ripple/ripple_TransactionAcquire.h b/src/cpp/ripple/ripple_TransactionAcquire.h index 347ae01c83..f679dd19aa 100644 --- a/src/cpp/ripple/ripple_TransactionAcquire.h +++ b/src/cpp/ripple/ripple_TransactionAcquire.h @@ -15,6 +15,8 @@ class TransactionAcquire , public CountedObject { public: + char const* getCountedObjectName () { return "TransactionAcquire"; } + typedef boost::shared_ptr pointer; public: