Extract interface change event from attribute events

Author: mliszcz

cppapi/server/device.cpp

@@ -6121,23 +6121,14 @@ void DeviceImpl::remove_local_command(const string &cmd_name)
 //
 //------------------------------------------------------------------------------------------------------------------
 
-void DeviceImpl::get_event_param(DeviceEventSubscriptionState& eve)
+void DeviceImpl::get_event_param(DeviceEventSubscriptionState& device_events_state)
 {
     ZmqEventSupplier *event_supplier_zmq = Util::instance()->get_zmq_event_supplier();
 
-    if (event_supplier_zmq->any_dev_intr_client(this) == true)
-    {
-        AttributeEventSubscriptionState ep;
-
-        ep.notifd = false;
-        ep.zmq = true;
-        ep.attr_id = -1;
-        ep.quality = false;
-        ep.data_ready = false;
-        ep.dev_intr_change = true;
+    device_events_state.has_interface_change_event_clients
+        = event_supplier_zmq->any_dev_intr_client(this);
 
-        eve.push_back(ep);
-    }
+    dev_attr->get_event_param(device_events_state.attribute_events);
 }
 
 //+-----------------------------------------------------------------------------------------------------------------
@@ -6154,19 +6145,14 @@ void DeviceImpl::get_event_param(DeviceEventSubscriptionState& eve)
 //
 //------------------------------------------------------------------------------------------------------------------
 
-void DeviceImpl::set_event_param(const DeviceEventSubscriptionState& eve)
+void DeviceImpl::set_event_param(const DeviceEventSubscriptionState& device_events_state)
 {
-    for (size_t loop = 0; loop < eve.size(); loop++)
+    if (device_events_state.has_interface_change_event_clients)
     {
-        if (eve[loop].attr_id == -1)
-        {
-            if (eve[loop].dev_intr_change == true)
-            {
-                set_event_intr_change_subscription(time(NULL));
-            }
-            break;
-        }
+        set_event_intr_change_subscription(time(NULL));
     }
+
+    dev_attr->set_event_param(device_events_state.attribute_events);
 }
 
 //+-----------------------------------------------------------------------------------------------------------------

cppapi/server/dserver.cpp

@@ -872,7 +872,6 @@ void DServer::restart(string &d_name)
 		dev_pol.push_back(tmp);
 	}
 
-	dev_to_del->get_device_attr()->get_event_param(eve);
 	dev_to_del->get_event_param(eve);
 
 //
@@ -1044,8 +1043,6 @@ void DServer::restart(string &d_name)
 // Re-set classical event parameters (if needed)
 //
 
-	Tango::MultiAttribute *m_attr = new_dev->get_device_attr();
-	m_attr->set_event_param(eve);
 	new_dev->set_event_param(eve);
 
 //
@@ -1964,13 +1961,9 @@ void DServer::mem_event_par(EventSubscriptionState& _map)
 		for (size_t j = 0;j < dev_list.size();j++)
 		{
 			DeviceEventSubscriptionState eve;
-			dev_list[j]->get_device_attr()->get_event_param(eve);
 			dev_list[j]->get_event_param(eve);
 
-			if (eve.size() != 0)
-			{
-				_map.insert(make_pair(dev_list[j]->get_name(),eve));
-			}
+			_map.insert(make_pair(dev_list[j]->get_name(),eve));
 		}
 	}
 }
@@ -1997,12 +1990,11 @@ void DServer::apply_event_par(EventSubscriptionState& _map)
 		for (size_t j = 0;j < dev_list.size();j++)
 		{
 			string &dev_name = dev_list[j]->get_name();
-            EventSubscriptionState::iterator ite;
+			EventSubscriptionState::iterator ite;
 			ite = _map.find(dev_name);
 
 			if (ite != _map.end())
 			{
-				dev_list[j]->get_device_attr()->set_event_param(ite->second);
 				dev_list[j]->set_event_param(ite->second);
 			}
 		}

cppapi/server/event_subscription_state.h

@@ -22,12 +22,17 @@ struct AttributeEventSubscriptionState
     EventClientLibVersions user;
     EventClientLibVersions att_conf;
     bool data_ready;
-    bool dev_intr_change;
     bool notifd;
     bool zmq;
 };
 
-typedef std::vector<AttributeEventSubscriptionState> DeviceEventSubscriptionState;
+typedef std::vector<AttributeEventSubscriptionState> AttributeEventSubscriptionStates;
+
+struct DeviceEventSubscriptionState
+{
+    bool has_interface_change_event_clients;
+    AttributeEventSubscriptionStates attribute_events;
+};
 
 typedef std::map<std::string, DeviceEventSubscriptionState> EventSubscriptionState;
 

cppapi/server/multiattribute.cpp

@@ -1501,7 +1501,7 @@ void MultiAttribute::read_alarm(string &status)
 //
 //------------------------------------------------------------------------------------------------------------------
 
-void MultiAttribute::get_event_param(DeviceEventSubscriptionState& eve)
+void MultiAttribute::get_event_param(AttributeEventSubscriptionStates& eve)
 {
 	unsigned int i;
 
@@ -1600,7 +1600,7 @@ void MultiAttribute::get_event_param(DeviceEventSubscriptionState& eve)
 //
 //------------------------------------------------------------------------------------------------------------------
 
-void MultiAttribute::set_event_param(const DeviceEventSubscriptionState& eve)
+void MultiAttribute::set_event_param(const AttributeEventSubscriptionStates& eve)
 {
 	for (size_t i = 0;i < eve.size();i++)
 	{

cppapi/server/multiattribute.h

@@ -269,8 +269,8 @@ class MultiAttribute
 	void remove_attribute(string &,bool);
 	vector<long> &get_w_attr_list() {return writable_attr_list;}
 	bool is_att_quality_alarmed();
-	void get_event_param(DeviceEventSubscriptionState&);
-	void set_event_param(const DeviceEventSubscriptionState&);
+	void get_event_param(AttributeEventSubscriptionStates&);
+	void set_event_param(const AttributeEventSubscriptionStates&);
 	void add_alarmed_quality_factor(string &);
 	void add_default(vector<AttrProperty> &,string &,string &,long);
 	void add_attr(Attribute *att);