src/AlarmHandlerDynAttrUtils.cpp

@@ -173,8 +173,8 @@ void AlarmHandler::add_AlarmFormula_dynamic_attribute(string attname)
 	//	Not Polled
 	alarmformula->set_disp_level(Tango::OPERATOR);
 	//	Not Memorized
-	alarmformula->set_change_event(true, false);
-	alarmformula->set_archive_event(true, false);
+	alarmformula->set_change_event(true, true);
+	alarmformula->set_archive_event(true, true);
 	char array[1];
 	array[0] = '\0';
 	AlarmFormula_data.insert(make_pair(attname, array));

src/AlarmHandlerStateMachine.cpp

@@ -252,6 +252,54 @@ bool AlarmHandler::is_alarmSummary_allowed(TANGO_UNUSED(Tango::AttReqType type))
 	return true;
 }
 
+//--------------------------------------------------------
+/**
+ *	Method      : AlarmHandler::is_eventList_allowed()
+ *	Description : Execution allowed for eventList attribute
+ */
+//--------------------------------------------------------
+bool AlarmHandler::is_eventList_allowed(TANGO_UNUSED(Tango::AttReqType type))
+{
+
+	//	Not any excluded states for eventList attribute in read access.
+	/*----- PROTECTED REGION ID(AlarmHandler::eventListStateAllowed_READ) ENABLED START -----*/
+	
+	/*----- PROTECTED REGION END -----*/	//	AlarmHandler::eventListStateAllowed_READ
+	return true;
+}
+
+//--------------------------------------------------------
+/**
+ *	Method      : AlarmHandler::is_eventSummary_allowed()
+ *	Description : Execution allowed for eventSummary attribute
+ */
+//--------------------------------------------------------
+bool AlarmHandler::is_eventSummary_allowed(TANGO_UNUSED(Tango::AttReqType type))
+{
+
+	//	Not any excluded states for eventSummary attribute in read access.
+	/*----- PROTECTED REGION ID(AlarmHandler::eventSummaryStateAllowed_READ) ENABLED START -----*/
+	
+	/*----- PROTECTED REGION END -----*/	//	AlarmHandler::eventSummaryStateAllowed_READ
+	return true;
+}
+
+//--------------------------------------------------------
+/**
+ *	Method      : AlarmHandler::is_alarmDisabled_allowed()
+ *	Description : Execution allowed for alarmDisabled attribute
+ */
+//--------------------------------------------------------
+bool AlarmHandler::is_alarmDisabled_allowed(TANGO_UNUSED(Tango::AttReqType type))
+{
+
+	//	Not any excluded states for alarmDisabled attribute in read access.
+	/*----- PROTECTED REGION ID(AlarmHandler::alarmDisabledStateAllowed_READ) ENABLED START -----*/
+	
+	/*----- PROTECTED REGION END -----*/	//	AlarmHandler::alarmDisabledStateAllowed_READ
+	return true;
+}
+
 //--------------------------------------------------------
 /**
  *	Method      : AlarmHandler::is_AlarmState_allowed()

src/CMakeLists.txt

+cmake_minimum_required(VERSION 3.2)
+
+# source files
+set(SRC_FILES ${SRC_FILES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/AlarmHandler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/AlarmHandlerClass.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/AlarmHandlerDynAttrUtils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/AlarmHandlerStateMachine.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/alarm_table.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/alarm-thread.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/ClassFactory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_thread.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/event_table.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/SubscribeThread.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/update-thread.cpp
+    PARENT_SCOPE)

src/ClassFactory.cpp

@@ -32,7 +32,7 @@
 //        (Program Obviously used to Generate tango Object)
 //=============================================================================
 
-#include <tango.h>
+#include <tango/tango.h>
 #include <AlarmHandlerClass.h>
 
 //	Add class header files if needed

src/SubscribeThread.cpp

-static const char *RcsId = "$Header: /home/cvsadm/cvsroot/fermi/servers/hdb++/hdb++es/src/SubscribeThread.cpp,v 1.6 2014-03-06 15:21:43 graziano Exp $";
-//+=============================================================================
-//
-// file :         HdbEventHandler.cpp
-//
-// description :  C++ source for thread management
-// project :      TANGO Device Server
-//
-// $Author: graziano $
-//
-// $Revision: 1.6 $
-//
-// $Log: SubscribeThread.cpp,v $
-// Revision 1.6  2014-03-06 15:21:43  graziano
-// StartArchivingAtStartup,
-// start_all and stop_all,
-// archiving of first event received at subscribe
-//
-// Revision 1.5  2014-02-20 14:59:02  graziano
-// name and path fixing
-// removed start acquisition from add
-//
-// Revision 1.4  2013-09-24 08:42:21  graziano
-// bug fixing
-//
-// Revision 1.3  2013-09-02 12:13:22  graziano
-// cleaned
-//
-// Revision 1.2  2013-08-23 10:04:53  graziano
-// development
-//
-// Revision 1.1  2013-07-17 13:37:43  graziano
-// *** empty log message ***
-//
-//
-//
-// copyleft :     European Synchrotron Radiation Facility
-//                BP 220, Grenoble 38043
-//                FRANCE
-//
-//-=============================================================================
-
-
 #include "AlarmHandler.h"
 #include "event_table.h"
 
@@ -64,6 +21,12 @@ void SubscribeThread::updateProperty()
 }
 //=============================================================================
 //=============================================================================
+void SubscribeThread::signal()
+{
+	shared->signal();
+}
+//=============================================================================
+//=============================================================================
 void *SubscribeThread::run_undetached(void *ptr)
 {
 	INFO_STREAM << "SubscribeThread id="<<omni_thread::self()->id()<<endl;
@@ -71,16 +34,20 @@ void *SubscribeThread::run_undetached(void *ptr)
 	{
 		//	Try to subscribe
 		usleep(500000);		//TODO: try to delay a bit subscribe_events
+		if(shared->get_if_stop())
+			break;
 		DEBUG_STREAM << "SubscribeThread::"<<__func__<<": AWAKE"<<endl;
 		updateProperty();
 		alarm_dev->events->subscribe_events();
 		int	nb_to_subscribe = shared->nb_sig_to_subscribe();
+		shared->check_signal_property(); //check if, while subscribing, new alarms to be saved in properties where added (update action)
 		//	And wait a bit before next time or
 		//	wait a long time if all signals subscribed
 		{
 			omni_mutex_lock sync(*shared);
 			//shared->lock();
-			if (nb_to_subscribe==0 && shared->action == NOTHING)
+			int act=shared->action.load();
+			if (nb_to_subscribe==0 && act == NOTHING)
 			{
 				DEBUG_STREAM << "SubscribeThread::"<<__func__<<": going to wait nb_to_subscribe=0"<<endl;
 				//shared->condition.wait();
@@ -98,7 +65,7 @@ void *SubscribeThread::run_undetached(void *ptr)
 			//shared->unlock();
 		}
 	}
-	shared->unsubscribe_events();
+	//shared->unsubscribe_events();
 	INFO_STREAM <<"SubscribeThread::"<< __func__<<": exiting..."<<endl;
 	return NULL;
 }

src/alarm-thread.h

 /*
  * alarm-thread.h
  *
- * $Author: graziano $
- *
- * $Revision: 1.3 $
- *
- * $Log: alarm-thread.h,v $
- * Revision 1.3  2008-04-23 15:00:57  graziano
- * small code cleanings
- *
- *
- *
  * copyleft: Sincrotrone Trieste S.C.p.A. di interesse nazionale
  *           Strada Statale 14 - km 163,5 in AREA Science Park
  *           34012 Basovizza, Trieste ITALY
@@ -20,7 +10,7 @@
 #define ALARM_THREAD_H
 
 #include <omnithread.h>
-#include <tango.h>
+#include <tango/tango.h>
 #include <AlarmHandler.h>
 
 #define ALARM_THREAD_EXIT				"alarm_thread_exit"