remove NotifdEvent (#295)

* Progress: remove NotifdEventConsumer

* Progress: remove NotifdEventSupplier

* Progress: move EventConsumer related stuff to even_consumer.cxx

* handle rebase

* Progress: fix size test

* Progress: change source files extension

* Progress: move tpp file

* Progress: resolve after rebase mess

* Progress: fix some codacy

* Fix typo

* Progress: remove omniCOS dependency

* Progress: more clean-ups

Author: Ingvord

configure/CMakeLists.txt

@@ -21,15 +21,13 @@ endif(IDL_BASE)
 if(OMNI_BASE)
     message("Using OMNI_BASE=${OMNI_BASE}")
     set(OMNIORB_PKG_INCLUDE_DIRS ${OMNI_BASE}/include)
-    set(OMNIORB_PKG_LIBRARIES "-lomniORB4 -lomnithread -lCOS4 -lomniDynamic4")
+    set(OMNIORB_PKG_LIBRARIES "-lomniORB4 -lomnithread -lomniDynamic4")
     set(OMNIIDL_PATH ${OMNI_BASE}/bin/)
     include_directories(${OMNI_BASE}/include)
     link_directories(${OMNI_BASE}/lib)
 else(OMNI_BASE)
     #CORBA
     pkg_search_module(OMNIORB_PKG REQUIRED omniORB4)
-    #COS
-    pkg_search_module(OMNICOS_PKG REQUIRED omniCOS4)
     #dynamic CORBA
     pkg_search_module(OMNIDYN_PKG REQUIRED omniDynamic4)
     if(NOT OMNIORB_PKG_FOUND)

include/CMakeLists.txt

@@ -56,11 +56,11 @@ set(CLIENT_HELPERS
         tango/client/helpers/Xstring.h)
 
 set(CLIENT_TEMPLATES
-        tango/client/event.tpp
         tango/client/devapi_attr.tpp
         tango/client/devapi_utils.tpp
         tango/client/api_util.tpp
-        tango/client/devapi_pipe.tpp)
+        tango/client/devapi_pipe.tpp
+        tango/client/event_consumer.tpp)
 
 set(SERVER_HEADERS tango/server/attrdesc.h
         tango/server/attribute.h

include/tango/client/ApiUtil.h

@@ -206,14 +206,8 @@ namespace Tango {
 // EventConsumer related methods
 //
 
-		void create_notifd_event_consumer();
-
 		void create_zmq_event_consumer();
 
-		bool is_notifd_event_consumer_created() { return notifd_event_consumer != NULL; }
-
-		NotifdEventConsumer *get_notifd_event_consumer();
-
 		bool is_zmq_event_consumer_created() { return zmq_event_consumer != NULL; }
 
 		ZmqEventConsumer *get_zmq_event_consumer();
@@ -285,7 +279,6 @@ namespace Tango {
 		ApiUtilExt *ext;        // Class extension
 #endif
 
-		NotifdEventConsumer *notifd_event_consumer;
 		TangoSys_Pid cl_pid;
 		int user_connect_timeout;
 		ZmqEventConsumer *zmq_event_consumer;

include/tango/client/Database.h

@@ -1902,9 +1902,7 @@ namespace Tango {
 
 		void reread_filedatabase();
 
-		void write_event_channel_ior_filedatabase(string &);
-
-		void build_connection();
+	    void build_connection();
 
 		void post_reconnection();
 

include/tango/client/devapi.h

@@ -64,8 +64,6 @@ namespace Tango {
 
 	class AsynReq;
 
-	class NotifdEventConsumer;
-
 	class ZmqEventConsumer;
 
 	class CallBack;

include/tango/client/event_consumer.tpp

@@ -0,0 +1,41 @@
+//
+// Created by ingvord on 10/24/16.
+//
+
+#pragma once
+
+
+//+-----------------------------------------------------------------------------------------------------------------
+//
+// method :
+//		EventConsumer::attr_to_device()
+//
+// description :
+//		Method to initialize in the DeviceAttribute instance given to the user the attribute value which are received
+//      in a AttrValUnion (or in a class inheriting from)
+//
+// argument :
+//		in :
+//			- attr_value :
+//		out :
+//			- dev_attr :
+//
+//-------------------------------------------------------------------------------------------------------------------
+template <typename T>
+inline void Tango::EventConsumer::base_attr_to_device(const T *attr_value,DeviceAttribute *dev_attr)
+{
+    dev_attr->name = attr_value->name;
+    dev_attr->quality = attr_value->quality;
+    dev_attr->time = attr_value->time;
+    dev_attr->dim_x = attr_value->r_dim.dim_x;
+    dev_attr->dim_y = attr_value->r_dim.dim_y;
+    dev_attr->set_w_dim_x(attr_value->w_dim.dim_x);
+    dev_attr->set_w_dim_y(attr_value->w_dim.dim_y);
+    dev_attr->err_list = new DevErrorList(attr_value->err_list);
+    dev_attr->data_format = attr_value->data_format;
+
+    if (dev_attr->quality != Tango::ATTR_INVALID)
+    {
+        att_union_to_device(&attr_value->zvalue,dev_attr);
+    }
+}