Add some monitoring support to NetworkOPs.

src/NetworkOPs.cpp

@@ -1,15 +1,16 @@
 
 #include "NetworkOPs.h"
 
-#include <boost/bind.hpp>
-#include <boost/unordered_map.hpp>
-
 #include "utils.h"
 #include "Application.h"
 #include "Transaction.h"
 #include "LedgerConsensus.h"
 #include "LedgerTiming.h"
 #include "Log.h"
+#include "NewcoinAddress.h"
+
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
 
 // This is the primary interface into the "client" portion of the program.
 // Code that wants to do normal operations on the network such as
@@ -553,7 +554,6 @@ bool NetworkOPs::recvPropose(uint32 proposeSeq, const uint256& proposeHash,
 	}
 
 	return mConsensus->peerPosition(proposal);
-	
 }
 
 SHAMap::pointer NetworkOPs::getTXMap(const uint256& hash)
@@ -663,4 +663,92 @@ Json::Value NetworkOPs::getServerInfo()
 	return info;
 }
 
+//
+// Monitoring:: publisher side
+//
+
+void NetworkOPs::pubAccountInfo(const NewcoinAddress& naAccountID, const Json::Value& jvObj)
+{
+	boost::interprocess::sharable_lock<boost::interprocess::interprocess_upgradable_mutex>	sl(mMonitorLock);
+
+	subInfoMapType::iterator	simIterator	= mSubAccountInfo.find(naAccountID);
+
+	if (simIterator == mSubAccountInfo.end())
+	{
+		// Address not found do nothing.
+		nothing();
+	}
+	else
+	{
+		// Found it.
+		BOOST_FOREACH(InfoSub* ispListener, simIterator->second)
+		{
+			ispListener->send(jvObj);
+		}
+	}
+}
+
+//
+// Monitoring
+//
+
+void NetworkOPs::subAccountInfo(InfoSub* ispListener, const std::vector<NewcoinAddress>& vnaAccountIDs)
+{
+	boost::interprocess::scoped_lock<boost::interprocess::interprocess_upgradable_mutex>	sl(mMonitorLock);
+
+	BOOST_FOREACH(NewcoinAddress naAccountID, vnaAccountIDs)
+	{
+		subInfoMapType::iterator	simIterator	= mSubAccountInfo.find(naAccountID);
+		if (simIterator == mSubAccountInfo.end())
+		{
+			// Not found
+			boost::unordered_set<InfoSub*>	usisElement;
+
+			usisElement.insert(ispListener);
+			mSubAccountInfo.insert(simIterator, make_pair(naAccountID, usisElement));
+		}
+		else
+		{
+			// Found
+			simIterator->second.insert(ispListener);
+		}
+	}
+}
+
+void NetworkOPs::unsubAccountInfo(InfoSub* ispListener, const std::vector<NewcoinAddress>& vnaAccountIDs)
+{
+	boost::interprocess::scoped_lock<boost::interprocess::interprocess_upgradable_mutex>	sl(mMonitorLock);
+
+	BOOST_FOREACH(NewcoinAddress naAccountID, vnaAccountIDs)
+	{
+		subInfoMapType::iterator	simIterator	= mSubAccountInfo.find(naAccountID);
+		if (simIterator == mSubAccountInfo.end())
+		{
+			// Not found.  Done.
+			nothing();
+		}
+		else
+		{
+			// Found
+			simIterator->second.erase(ispListener);
+
+			if (simIterator->second.empty())
+			{
+				// Don't need hash entry.
+				mSubAccountInfo.erase(simIterator);
+			}
+		}
+	}
+}
+
+
+void NetworkOPs::subAccountChanges(InfoSub* ispListener, const uint256 uLedgerHash)
+{
+}
+
+void NetworkOPs::unsubAccountChanges(InfoSub* ispListener)
+{
+}
+
+
 // vim:ts=4

src/NetworkOPs.h

@@ -1,13 +1,16 @@
 #ifndef __NETWORK_OPS__
 #define __NETWORK_OPS__
 
-#include "LedgerMaster.h"
 #include "AccountState.h"
-#include "RippleState.h"
+#include "LedgerMaster.h"
 #include "NicknameState.h"
+#include "RippleState.h"
 #include "SerializedValidation.h"
 
-// #include <boost/asio.hpp>
+#include <boost/interprocess/sync/interprocess_upgradable_mutex.hpp>
+#include <boost/interprocess/sync/sharable_lock.hpp>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 
 // Operations that clients may wish to perform against the network
 // Master operational handler, server sequencer, network tracker
@@ -15,6 +18,12 @@
 class Peer;
 class LedgerConsensus;
 
+class InfoSub
+{
+public:
+	virtual	void send(const Json::Value& jvObj) = 0;
+};
+
 class NetworkOPs
 {
 public:
@@ -41,6 +50,12 @@ protected:
 
 	void setMode(OperatingMode);
 
+	typedef boost::unordered_map<NewcoinAddress,boost::unordered_set<InfoSub*> >			subInfoMapType;
+	typedef boost::unordered_map<NewcoinAddress,boost::unordered_set<InfoSub*> >::iterator	subInfoMapIterator;
+
+    boost::interprocess::interprocess_upgradable_mutex	mMonitorLock;
+	subInfoMapType										mSubAccountInfo;
+
 public:
 	NetworkOPs(boost::asio::io_service& io_service, LedgerMaster* pLedgerMaster);
 
@@ -133,6 +148,23 @@ public:
 	// client information retrieval functions
 	std::vector< std::pair<uint32, uint256> >
 		getAffectedAccounts(const NewcoinAddress& account, uint32 minLedger, uint32 maxLedger);
+
+	//
+	// Monitoring: publisher side
+	//
+
+	void pubAccountInfo(const NewcoinAddress& naAccountID, const Json::Value& jvObj);
+
+	//
+	// Monitoring: subscriber side
+	//
+
+	// --> vnaAddress: empty = all
+	void subAccountInfo(InfoSub* ispListener, const std::vector<NewcoinAddress>& vnaAccountIDs);
+	void unsubAccountInfo(InfoSub* ispListener, const std::vector<NewcoinAddress>& vnaAccountIDs);
+
+	void subAccountChanges(InfoSub* ispListener, const uint256 uLedgerHash);
+	void unsubAccountChanges(InfoSub* ispListener);
 };
 
 #endif