FOGL-2297 Update DeltaMap when configuration changes

delta_filter.cpp

@@ -71,6 +71,7 @@ void DeltaFilter::ingest(vector<Reading *> *readings, vector<Reading *>& out)
 					it != readings->end(); it++)
 	{
 		Reading *reading = *it;
+		lock_guard<mutex> guard(m_configMutex); // Protect against reconfiguration
 		// Find this asset in the map of values we hold	
 		DeltaMap::iterator deltaIt = m_state.find(reading->getAssetName());
 		if (deltaIt == m_state.end())
@@ -243,8 +244,13 @@ struct timeval	now, res;
 void
 DeltaFilter::reconfigure(const string& newConfig)
 {
+	lock_guard<mutex> guard(m_configMutex);
 	setConfig(newConfig);
-        handleConfig(m_config);                   
+        handleConfig(m_config);
+	for (DeltaMap::iterator it = m_state.begin(); it != m_state.end(); ++it)
+	{
+		it->second->reconfigure(m_tolerance, m_rate);
+	}
 }
 
 /**

include/delta_filter.h

@@ -15,6 +15,7 @@
 #include <string>                 
 #include <vector>
 #include <regex>
+#include <mutex>
 
 /**
  * A FogLAMP filter that is used to filter out duplicate data in the readings stream.
@@ -39,6 +40,11 @@ class DeltaFilter : public FogLampFilter {
 				~DeltaData();
 				bool			evaluate(Reading *);
 				const std::string& 	getAssetName() { return m_lastSent->getAssetName(); };
+				void			reconfigure(double tolerance, struct timeval rate)
+							{
+								m_tolerance = tolerance;
+								m_rate = rate;
+							};
 			private:
 				Reading		*m_lastSent;
 				struct timeval	m_lastSentTime;
@@ -50,6 +56,7 @@ class DeltaFilter : public FogLampFilter {
 		DeltaMap	m_state;
 		double		m_tolerance;
 		struct timeval	m_rate;
+		std::mutex	m_configMutex;
 };