update

.travis.yml

@@ -95,7 +95,6 @@ after_success:
 deploy:
   - provider: script
     script: bash .travis/deploy.sh
-    skip_cleanup: true
     on:
       tags: true
 

.travis/debian10/Dockerfile

@@ -6,6 +6,8 @@ ARG APP_GID=2000
 
 MAINTAINER TANGO Controls team <tango@esrf.fr>
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y \
   apt-utils                              \
   build-essential                        \

.travis/debian8/Dockerfile

@@ -6,6 +6,8 @@ ARG APP_GID=2000
 
 MAINTAINER TANGO Controls team <tango@esrf.fr>
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN sed -i '/jessie-updates/d' /etc/apt/sources.list  # Now archived
 
 RUN apt-get update && apt-get install -y \

.travis/debian9/Dockerfile

@@ -6,6 +6,8 @@ ARG APP_GID=2000
 
 MAINTAINER TANGO Controls team <tango@esrf.fr>
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y \
   apt-utils                              \
   build-essential                        \

.travis/gcc-latest/Dockerfile

@@ -6,6 +6,8 @@ ARG APP_GID=2000
 
 MAINTAINER TANGO Controls team <tango@esrf.fr>
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y \
   apt-utils                              \
   build-essential                        \

.travis/llvm-latest/Dockerfile

@@ -8,6 +8,8 @@ ARG APP_GID=2000
 
 MAINTAINER TANGO Controls team <tango@esrf.fr>
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y \
   apt-utils                              \
   build-essential                        \

.travis/ubuntu-20.04/Dockerfile

@@ -6,6 +6,8 @@ ARG APP_GID=2000
 
 MAINTAINER TANGO Controls team <tango@esrf.fr>
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y \
   apt-utils                              \
   build-essential                        \

CMakeLists.txt

@@ -14,7 +14,6 @@ if (USE_PCH AND NOT (CMAKE_CXX_COMPILER_ID MATCHES "GNU|MSVC|Clang"))
     set(USE_PCH OFF)
 endif()
 
-enable_testing()
 #need to define the version of the library
 set(MAJOR_VERSION "9")
 set(MINOR_VERSION "4")
@@ -29,7 +28,7 @@ endif()
 
 #convenient versions
 set(LIBRARY_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
-set(SO_VERSION "${MAJOR_VERSION}")
+set(SO_VERSION "${MAJOR_VERSION}${MINOR_VERSION}")
 
 set(TANGO_HOST $ENV{TANGO_HOST})
 include(configure/CMakeLists.txt)
@@ -46,9 +45,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/log4tango/include)
 #source code
 add_subdirectory("log4tango")
 add_subdirectory("cppapi")
-if(NOT WIN32)
+
+if(BUILD_TESTING)
     add_subdirectory("cpp_test_suite")
-endif(NOT WIN32)
+endif()
 
 if(WIN32)
     include(configure/cmake_win.cmake)

INSTALL.md

@@ -28,6 +28,7 @@
 - `-DCMAKE_VERBOSE_MAKEFILE=true`
 - `-DTANGO_USE_USING_NAMESPACE=<ON|OFF>` choose `OFF` for modern builds
 - `-DUSE_PCH=<ON|OFF>`
+- `-DBUILD_TESTING=<ON|OFF>` Build the test suite (`ON` by default)
 
 Typical output:
 

appveyor.yml

@@ -135,16 +135,17 @@ install:
   - cmd: cd "C:\projects\cppTango"
   - cmd: set BOOST_ROOT=%BOOST_ROOT%
   - cmd: set ZMQ_BASE=C:/projects/zeromq/
+  - cmd: set CPPZMQ_BASE=C:/projects/zeromq/
   - cmd: set IDL_BASE=%IDL_BIN%
   - cmd: set OMNI_BASE=C:/projects/omniorb/
   - cmd: set PTHREAD_WIN=C:/projects/pthreads-win32/
   - cmd: if not defined USE_PCH set USE_PCH=OFF
   #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE .
   #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE .
-  - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=%USE_PCH% .
+  - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DCPPZMQ_BASE="%CPPZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=%USE_PCH% -DBUILD_TESTING=OFF .
   - cmd: cd c:/projects/debug_build
   #- cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Debug .
-  - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DCMAKE_BUILD_TYPE=Debug -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=%USE_PCH% .
+  - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DCMAKE_BUILD_TYPE=Debug -DIDL_BASE="%IDL_BASE%" -DOMNI_BASE="%OMNI_BASE%" -DZMQ_BASE="%ZMQ_BASE%" -DCPPZMQ_BASE="%CPPZMQ_BASE%" -DPTHREAD_WIN=%PTHREAD_WIN% -DUSE_PCH=%USE_PCH% -DBUILD_TESTING=OFF .
 
 clone_folder: C:\projects\cppTango
 
@@ -189,9 +190,26 @@ on_finish:
 
 on_failure:
   #RDP for failure
-  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 artifacts:
   - path: ./*.exe
   - path: ./*.zip
   - path: ./*.msi
+
+deploy:
+- provider: GitHub
+  tag: $(APPVEYOR_REPO_TAG_NAME)
+  description: "Release $(APPVEYOR_REPO_TAG_NAME)"
+  auth_token:
+    # User: cppTango-bot
+    # Personal Access token with repo scope, encrypted via https://ci.appveyor.com/tools/encrypt
+    secure: KnvPAbdhmiTQxTLOGq7nyNs6d1JYbKVKspPgigzQ3fDrI+nkaxqWCw6UmRkS2Gqe
+  artifact: /.*/
+  repository: tango-controls/cppTango
+  draft: true
+  prerelease: true
+  force_update: true
+  # deploy on tag push only
+  on:
+    APPVEYOR_REPO_TAG: true

configure/CMakeLists.txt

@@ -239,3 +239,4 @@ include(GNUInstallDirs)
 include(configure/coveralls.cmake)
 
 option(TANGO_USE_USING_NAMESPACE "Use \"using namespace\" in header files (deprecated, but ON for backwards compatibility.)." ON)
+option(TANGO_JPEG_MMX "Build MMX support" ON)

configure/cmake_win.cmake

@@ -165,8 +165,8 @@ install(DIRECTORY $ENV{OMNI_BASE}/include/omniVms DESTINATION include COMPONENT
 install(FILES $ENV{OMNI_BASE}/include/omniconfig.h DESTINATION include COMPONENT headers)
 install(FILES $ENV{OMNI_BASE}/include/omnithread.h DESTINATION include COMPONENT headers)
 install(FILES $ENV{ZMQ_BASE}/include/zmq.h DESTINATION include COMPONENT headers)
-install(FILES $ENV{ZMQ_BASE}/include/zmq.hpp DESTINATION include COMPONENT headers)
-install(FILES $ENV{ZMQ_BASE}/include/zmq_addon.hpp DESTINATION include COMPONENT headers)
+install(FILES $ENV{CPPZMQ_BASE}/include/zmq.hpp DESTINATION include COMPONENT headers)
+install(FILES $ENV{CPPZMQ_BASE}/include/zmq_addon.hpp DESTINATION include COMPONENT headers)
 install(FILES $ENV{ZMQ_BASE}/include/zmq_utils.h DESTINATION include COMPONENT headers)
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")

cpp_test_suite/new_tests/cxx_dserver_misc.cpp

@@ -6,6 +6,26 @@
 #undef SUITE_NAME
 #define SUITE_NAME DServerMiscTestSuite
 
+struct EventCallback : public Tango::CallBack
+{
+    EventCallback()
+        : num_of_all_events(0)
+        , num_of_error_events(0)
+    {}
+
+    void push_event(Tango::EventData* event)
+    {
+        num_of_all_events++;
+        if (event->err)
+        {
+            num_of_error_events++;
+        }
+    }
+
+    int num_of_all_events;
+    int num_of_error_events;
+};
+
 class DServerMiscTestSuite: public CxxTest::TestSuite
 {
 protected:
@@ -203,6 +223,38 @@ cout << "str = " << str << endl;
 		TS_ASSERT(dserver->info().server_id == full_ds_name);
 		TS_ASSERT(dserver->info().server_version == server_version);
 	}
+
+    /* Tests that subscriber can receive events immediately after
+     * a device restart without a need to wait for re-subscription.
+     */
+    void test_event_subscription_recovery_after_device_restart()
+    {
+        EventCallback callback{};
+
+        std::string attribute_name = "event_change_tst";
+
+        TS_ASSERT_THROWS_NOTHING(device1->subscribe_event(
+            attribute_name,
+            Tango::USER_EVENT,
+            &callback));
+
+        TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent"));
+        Tango_sleep(2);
+        TS_ASSERT_EQUALS(2, callback.num_of_all_events);
+        TS_ASSERT_EQUALS(0, callback.num_of_error_events);
+
+        {
+            Tango::DeviceData input{};
+            input << device1_name;
+            TS_ASSERT_THROWS_NOTHING(dserver->command_inout("DevRestart", input));
+        }
+
+        TS_ASSERT_THROWS_NOTHING(device1->command_inout("IOPushEvent"));
+        Tango_sleep(2);
+        TS_ASSERT_EQUALS(3, callback.num_of_all_events);
+        TS_ASSERT_EQUALS(0, callback.num_of_error_events);
+    }
+
 };
 #undef cout
 #endif // DServerMiscTestSuite_h

cppapi/client/attr_proxy.cpp

@@ -412,14 +412,6 @@ void AttributeProxy::parse_name(std::string &full_name)
 		{
 			name_wo_prot = full_name.substr(pos + 3);
 		}
-		else if (protocol == TACO_PROTOCOL)
-		{
-			TangoSys_OMemStream desc;
-			desc << "Taco protocol is not supported" << std::ends;
-			ApiWrongNameExcept::throw_exception((const char*)"API_UnsupportedProtocol",
-						desc.str(),
-						(const char*)"AttributeProxy::parse_name()");
-		}
 		else
 		{
 			TangoSys_OMemStream desc;

cppapi/client/devapi.h

@@ -424,7 +424,6 @@ enum cb_sub_model
 #define 	CONNECTION_NOTOK	0
 
 #define		PROT_SEP			"://"
-#define		TACO_PROTOCOL		"taco"
 #define		TANGO_PROTOCOL		"tango"
 
 #define		MODIFIER			'#'

cppapi/client/devapi_base.cpp

@@ -2059,14 +2059,6 @@ void DeviceProxy::parse_name(std::string &full_name)
         {
             name_wo_prot = full_name_low.substr(pos + 3);
         }
-        else if (protocol == TACO_PROTOCOL)
-        {
-            TangoSys_OMemStream desc;
-            desc << "Taco protocol is not supported" << std::ends;
-            ApiWrongNameExcept::throw_exception((const char *) "API_UnsupportedProtocol",
-                                                desc.str(),
-                                                (const char *) "DeviceProxy::parse_name()");
-        }
         else
         {
             TangoSys_OMemStream desc;

cppapi/server/CMakeLists.txt

@@ -128,7 +128,8 @@ set(HEADERS attrdesc.h
             w_pipe.tpp
             subdev_diag.h
             encoded_attribute.h
-            encoded_format.h)
+            encoded_format.h
+            event_subscription_state.h)
 
 add_subdirectory(idl)
 add_subdirectory(jpeg)

cppapi/server/attribute.cpp

@@ -5313,7 +5313,7 @@ DeviceClass *Attribute::get_att_device_class(std::string &dev_name)
                 // Check whether our device is listed in this class
                 for (size_t i = 0; i < dev_list.size(); ++i)
                 {
-                    if (dev_list[i]->name() == dev_name)
+                    if (dev_list[i]->get_name() == dev_name)
                     {
                         // Our device is listed in this class, returns the corresponding DeviceClass pointer
                         return tmp_cl_list[loop];
@@ -5912,21 +5912,18 @@ bool Attribute::data_ready_event_subscribed()
 //
 //--------------------------------------------------------------------------------------------------------------------
 
-void Attribute::set_client_lib(int _l,std::string &ev_name)
+void Attribute::set_client_lib(int client_lib_version, EventType event_type)
 {
-	cout4 << "Attribute::set_client_lib(" << _l << "," << ev_name << ")" << std::endl;
-	int i;
-	for (i = 0; i < numEventType; i++)
-	{
-		if (ev_name == EventName[i])
-		{
-			break;
-		}
-	}
+	cout4 << "Attribute::set_client_lib("
+		<< client_lib_version << ","
+		<< EventName[event_type] << ")" << std::endl;
 
-	if (count(client_lib[i].begin(), client_lib[i].end(), _l) == 0)
+	if (0 == count(
+	    client_lib[event_type].begin(),
+	    client_lib[event_type].end(),
+	    client_lib_version))
 	{
-		client_lib[i].push_back(_l);
+		client_lib[event_type].push_back(client_lib_version);
 	}
 }
 

cppapi/server/attribute.h

@@ -2308,9 +2308,9 @@ class Attribute
 	bool is_mem_exception() {return att_mem_exception;}
 	virtual bool is_fwd_att() {return false;}
 
-	void set_client_lib(int,std::string &);
+	void set_client_lib(int, EventType);
 	std::vector<int> &get_client_lib(EventType _et) {return client_lib[_et];}
-	void remove_client_lib(int,const std::string &);
+	void remove_client_lib(int, const std::string &);
 
 	void add_config_5_specific(AttributeConfig_5 &);
 	void add_startup_exception(std::string,const DevFailed &);

cppapi/server/device.cpp

@@ -6106,17 +6106,17 @@ void DeviceImpl::remove_local_command(const std::string &cmd_name)
 //
 //------------------------------------------------------------------------------------------------------------------
 
-void DeviceImpl::get_event_param(std::vector<EventPar> &eve)
+void DeviceImpl::get_event_param(EventSubscriptionStates& eve)
 {
     ZmqEventSupplier *event_supplier_zmq = Util::instance()->get_zmq_event_supplier();
 
     if (event_supplier_zmq->any_dev_intr_client(this) == true)
     {
-        EventPar ep;
+        EventSubscriptionState ep;
 
         ep.notifd = false;
         ep.zmq = true;
-        ep.attr_id = -1;
+        ep.attribute_name = "";
         ep.quality = false;
         ep.data_ready = false;
         ep.dev_intr_change = true;
@@ -6139,11 +6139,11 @@ void DeviceImpl::get_event_param(std::vector<EventPar> &eve)
 //
 //------------------------------------------------------------------------------------------------------------------
 
-void DeviceImpl::set_event_param(std::vector<EventPar> &eve)
+void DeviceImpl::set_event_param(const EventSubscriptionStates& eve)
 {
     for (size_t loop = 0; loop < eve.size(); loop++)
     {
-        if (eve[loop].attr_id == -1)
+        if (eve[loop].attribute_name.empty())
         {
             if (eve[loop].dev_intr_change == true)
             {

cppapi/server/device.h

@@ -45,6 +45,7 @@
 #include <deviceclass.h>
 #include <devintr.h>
 #include <dintrthread.h>
+#include "event_subscription_state.h"
 
 namespace Tango
 {
@@ -3423,8 +3424,8 @@ class DeviceImpl : public virtual POA_Tango::Device
 	void disable_intr_change_ev() {intr_change_ev = false;}
 	bool is_intr_change_ev_enable() {return intr_change_ev;}
 
-	void get_event_param(std::vector<EventPar> &);
-	void set_event_param(std::vector<EventPar> &);
+	void get_event_param(EventSubscriptionStates&);
+	void set_event_param(const EventSubscriptionStates&);
 
 	void set_client_lib(int _l) {if (count(client_lib.begin(),client_lib.end(),_l)==0)client_lib.push_back(_l);}