Compare revisions

Graziano Scalamera · Lorenzo Pivetta · Graziano Scalamera · Lorenzo Pivetta · Graziano Scalamera · Graziano Scalamera
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 image:
-  name: nexus.engageska-portugal.pt/ska-docker/tango-dsconfig
-
-# The following variables are automatically passed down to the tangodb container
-# as well as the tangodatabaseds container and available within each.
-variables:
-  MYSQL_ROOT_PASSWORD: "secret"
-  MYSQL_DATABASE: "tango"
-  MYSQL_USER: "tango"
-  MYSQL_PASSWORD: "tango"
-  MYSQL_HOST: "tangodb"
-  TANGO_HOST: "localhost:10000"
+        name: harbor.skao.int/production/ska-tango-images-tango-dsconfig:1.5.5

 stages:
  - build
@@ -17,11 +7,11 @@ stages:

 build_job:
  stage: build
+  tags:
+    - docker
  before_script:
-    #TODO: remove procps use for ps
-    - sudo apt update && sudo apt -y --no-install-recommends install build-essential cmake pkg-config libboost-thread-dev procps
+    - sudo apt update && sudo apt -y --no-install-recommends install build-essential cmake pkg-config libboost-thread-dev
  script:
-    #- make
    - mkdir build && cd build
    - cmake -DBUILD_TESTS=ON ..
    - make
@@ -33,30 +23,26 @@ build_job:

 test_load_job:
  stage: test
+  tags:
+    - docker
  before_script:
-    #TODO: remove procps use for ps
-    - sudo apt update && sudo apt -y --no-install-recommends install libboost-thread-dev procps
+    - sudo apt update && sudo apt -y --no-install-recommends install libboost-thread-dev
  script:
    - sleep 10
    - /usr/local/bin/DataBaseds 2 -ORBendPoint giop:tcp::10000 &
    - sleep 10
    - exit_code=2
    - json2tango -w -a -u ./test/ah_config.json || exit_code=$?
-    # json2tango returns 2 if values written to DB
    - if [ ${exit_code} -ne 2 ]; then echo "Tango DB configuration failed!" ; else echo "Tango DB configuration succedeed!"; fi
-    - sleep 5
    - ./build/alarm-handler-srv 01 &
    - ./build/bin/testdevice-srv 01 &
-    - sleep 10
-    - ps -ef | grep alarm-handler-srv | grep -v grep
-    - ps -ef | grep testdevice-srv | grep -v grep
    - sleep 5
    - python ./test/load-alarm-conf.py --device=alarm/handler/01 --load="tag=test0;formula=(alarm/test/01/condition == 1);on_delay=0;off_delay=0;priority=high;shlvd_time=0;group=gr_test;message=Test alarm;url=;on_command=;off_command=;enabled=1"
    - sleep 1
    - python ./test/check-alarm-conf.py --device=alarm/handler/01 --alarm="tag=test0;formula=(alarm/test/01/condition == 1);on_delay=0;off_delay=0;priority=high;shlvd_time=0;group=gr_test;message=Test alarm;url=;on_command=;off_command=;enabled=1"
  needs: ["build_job"]
  services:
-    - name: nexus.engageska-portugal.pt/ska-docker/tango-db
+    - name: harbor.skao.int/production/ska-tango-images-tango-db:10.4.16
      alias: tangodb


--- a/.gitlab-ci.yml_multi_stage
+++ b/.gitlab-ci.yml_multi_stage
 image:
-  name: nexus.engageska-portugal.pt/ska-docker/tango-dsconfig
+  name: harbor.skao.int/production/ska-tango-images-tango-dsconfig:1.5.5

 # The following variables are automatically passed down to the tangodb container
 # as well as the tangodatabaseds container and available within each.
@@ -17,9 +17,9 @@ stages:
  - test

 services:
-  - name: nexus.engageska-portugal.pt/ska-docker/tango-db
+  - name: harbor.skao.int/production/ska-tango-images-tango-db
    alias: tangodb
-#  - name: nexus.engageska-portugal.pt/ska-docker/tango-cpp
+#  - name: harbor.skao.int/production/ska-tango-images-tango-cpp
 #    alias: tangodatabaseds
 #    entrypoint: ["/usr/local/bin/DataBaseds"]
 #    command: ["2","-ORBendPoint giop:tcp::10000"]
@@ -60,7 +60,7 @@ configure_and_run_job:
    expire_in: 1 week
  needs: ["build_job"]
  #services:
-  #  - name: nexus.engageska-portugal.pt/ska-docker/tango-db
+  #  - name: harbor.skao.int/production/ska-tango-images-tango-db
  #    alias: tangodb

 test_job:

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,11 +103,19 @@ target_include_directories(alarm_handler
        "${PROJECT_BINARY_DIR}"
 	${Boost_INCLUDE_DIRS})

-set_target_properties(alarm_handler 
-    PROPERTIES 
+if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+    set_target_properties(alarm_handler
+        PROPERTIES
        OUTPUT_NAME ${AH_NAME}
        LINK_FLAGS "-Wl,--no-undefined"
-        CXX_STANDARD 11)
+        CXX_STANDARD 17)
+else()
+    set_target_properties(alarm_handler
+        PROPERTIES
+        OUTPUT_NAME ${AH_NAME}
+        LINK_FLAGS ""
+        CXX_STANDARD 17)
+endif()

 if(DO_CLANG_TIDY)
    set_target_properties(alarm_handler 

--- a/docs/AlarmHandler_Doc.pdf
+++ b/docs/AlarmHandler_Doc.pdf
--- a/docs/Formula.md
+++ b/docs/Formula.md
+# Formula syntax
+The formula is an expression with operators, operands and functions. Operands can be variables, constant values, or other expression optionally enclosed by parentheses.
+
+## Operands
+
+### Variables
+
+- Attributes names with or without fqdn (e.g. ```tango://host:port/name/of/dev/attr```, ```name/of/dev/attr```)
+- attribute properties ```.quality```, ```.alarm```, ```.normal``` so that
+  - ```name/of/dev/attr.quality``` returns the Tango quality (the integer value) of the attribute
+  - ```name/of/dev/attr.alarm``` returns true if the attribute ==UNACK or ==ACK
+  - ```name/of/dev/attr.normal``` returns true if the attribute ==NORM or ==RTNUN
+
+### Constants
+
+- Real numbers (e.g. ```name/of/dev/attr >= 35```, ```name/of/dev/attr < -23.5```)
+- Hexadecimal numbers (e.g. ```name/of/dev/attr != 0xaf```, ```name/of/dev/attr & 0x1A```)
+- Strings as any character between an opening and a closing ' (e.g. ```name/of/dev/status == 'The device is in ON state.'```)
+- Tango states enum labels (*ON, OFF, CLOSE, OPEN, INSERT, EXTRACT, MOVING, STANDBY, FAULT, INIT, RUNNING, ALARM, DISABLE, UNKNOWN*) (e.g. ```name/of/dev/state == FAULT```)
+- Tango quality enum labels (*ATTR_VALID, ATTR_INVALID, ATTR_WARNING, ATTR_ALARM, ATTR_CHANGING*) (e.g. ```name/of/dev/attr.quality == ATTR_ALARM```)
+- Alarm state enum labels (*NORM, UNACK, ACKED, RTNUN, SHLVD, DSUPR, OOSRV*) (e.g. ```name/of/dev/alarm_attr != NORM```)
+
+### Expressions
+
+- A combination of operands and operators enclosed by parentheses
+
+## Operators
+
+### Binary Math
+- Multiplication ```*```
+- Division ```/```
+- Addition ```+```
+- Subtraction ```-```
+### Binary Comparison
+- Equal ```==```
+- Not equal ```!=```
+- Greater than ```>```
+- Greater than or equal to  ```>=```
+- Less than ```<```
+- Less than or equal to  ```<=```
+### Binary Logical
+- Logical AND ```&&```
+- Logical OR ```||```
+### Binary Bitwise
+- Left shift ```<<```
+- Right shift ```>>```
+- Bitwise AND ```&```
+- Bitwise OR ```|```
+- Bitwise XOR ```^```
+### Unary Math
+- Minus ```-```
+### Unary Logical
+- Logical NOT ```!```
+
+### Binary operators order of precedence
+
+```
+*, /, +, -, <<, >>, <=, >=, >, <, ==, !=, &, |, ^, &&, ||
+```
+
+## Functions
+
+### Unary Functions
+- Absolute value of X ```abs(X)```
+- Sine of X ```sin(X)```
+- Cosine of X ```cos(X)```
+
+### Binary Functions
+- Minimum between two values X and Y ```min(X,Y)```
+- Maximum between two values X and Y ```max(X,Y)```
+- Power: X raised to the power of Y ```pow(X,Y)```
+
+### Ternary Functions
+- Conditional operator: if X then Y else Z ```X ? Y : Z```
+
+### Reduce Functions
+- Reduce OR: reduce array X applying logical OR to each element ```OR(X)```
+- Reduce AND: reduce array X applying logical AND to each element ```OR(X)```
+
+# Attributes types
+
+The following types of attribute are supported:
+
+```
+Scalar, Spectrum, Image
+```
+
+with data types:
+
+```
+DevBoolean, DevUChar, DevShort, DevUShort, DevLong, DevULong, DevLong64, DevULong64, DevFloat, DevDouble, DevString, DevState, DevEnum
+```
+
+```DevEncoded``` is not supported.
+
+The read part of every attribute is internally extracted in a vector of double with the ```extract_read``` method of the ```DeviceAttribute``` class. In this ways operations between attribute with different data types and sizes can be performed with the following constraints:
+- DevString attributes can only be compared with 'equal' or 'not equal' operators to DevString attributes or string constants
+- Binary operators can operate on arrays if both operands have the same size, or one of the two has size equal to one.
+
+# Operation on arrays
+
+## Indexes to access elements
+
+- A single element of a one-dimensional array attribute (Spectrum) can be extracted with a single index between square brackets (e.g. ```name/of/dev/attr[ind]```).
+- A single element of a two-dimensional array attribute (Image) can be extracted with two indexes between square brackets (e.g. ```name/of/dev/attr[ind_row][ind_column]```).
+- A one-dimensional array can be extracted from a two-dimensional array attribute (Image) with a single index between square brackets (e.g. ```name/of/dev/attr[ind_row]```).
+
+## Lists and ranges of indexes to slice arrays
+Indexes can be specified as a comma separated list and/or hyphen-separated range (e.g. ```[i0,i1-i2,...]```).
+In this way:
+- A slice can be extracted from a one-dimensional array with a list and/or range of indexes between square brackets (e.g. ```name/of/dev/1Dattr[i0,i1-i2,...]```).
+- A subset of rows can be extracted from a two-dimensional array with a list and/or range of indexes for the first dimension (e.g. ```name/of/dev/2Dattr[i0,i1-i2,...]```).
+- A single column slice can be extracted from a two-dimensional array with a list and/or range of indexes for the first dimension and a single index for the second dimension (e.g. ```name/of/dev/2Dattr[i0,i1-i2,...][i3]```).
+- A single row slice can be extracted from a two-dimensional array with a single index for the first dimension and list/range of indexes for the second dimension (e.g. ```name/of/dev/2Dattr[i0][i1-i2,i3,...]```).
+- An array slice can be extracted from a two-dimensional array with a list and/or range of indexes for both the first and second dimensions (e.g. ```name/of/dev/2Dattr[i0-i1,...][i2,i3,...]```).
+- To specify all elements of one dimension index -1 can be used (e.g. Column 3 of all rows of 2D array ```name/of/dev/2Dattr[-1][3]```).
+
+If any index exceeds actual dimensions of the array, the formula is evaluated to ERROR with an out of bounds exception.
+
+No check is done on the order and uniqueness of indexes, so it is allowed to concatenate duplicated and out of order elements/rows/columns (e.g. ```name/of/dev/2Dattr[0-2,1,0,..]``` evaluates to an array with rows 0,1,2,1,0 of 2Dattr)
+
+## Limitations
+
+- It is not possible to specify array constants (e.g. ```name/of/dev/attr > [val1,val2]```).
+- It is not possible to use indexes on expressions (e.g. ```(any_expression)[ind]```).
+
+## Unary operators and functions
+
+Unary operators and functions are applied to every element of the array
+
+## Binary operators and functions
+
+- If both operands have the same size, operators are applied element by element. Result is an array with the same size.
+- If one operand has size one, operators apply it to every element of the other operand. Result is an array with the same size.
+- Otherwise an exception is raised and the formula is evaluated to the *ERROR* state with the Reason, Descrption and Origin DevFailed fields properly filled.
+
+## Ternary Function
+- Conditional operator: if X then Y else Z. X is implicitly reduced with *OR* to have a boolean value, then Y or Z are evaluated depending on the result
+
+# Formula result
+Every formula produce a boolean result in the following way:
+1. each element of the array is tested as not equal to zero in order to have an array of booleans
+2. the array of boolean is reduced with OR (i.e. if at least one element of the array is TRUE, the result is TRUE) 
+
+# Errors
+
+If a formula cannot be evaluated, the corresponding alarm is set to the *ERROR* value with the Reason, Description and Origin DevFailed fields properly filled.
+Possible errors are:
+- Errors coming from the event system for one or more attributes involved in the formula
+- Errors coming from evaluation of array with different sizes
+- Errors coming from indexes out of bound while extracting elements from arrays
+- Unexpected errors while evaluating formulas
--- a/docs/TUPHA165.pdf
+++ b/docs/TUPHA165.pdf
--- a/docs/TUPHA165_poster.pdf
+++ b/docs/TUPHA165_poster.pdf
--- a/docs/alarm_handler_2020.pdf
+++ b/docs/alarm_handler_2020.pdf
--- a/docs/alarm_handler_tm20211014.pdf
+++ b/docs/alarm_handler_tm20211014.pdf
--- a/docs/alarm_tm2019.pdf
+++ b/docs/alarm_tm2019.pdf
--- a/docs/alarms-at-elettra-tm2017.pdf
+++ b/docs/alarms-at-elettra-tm2017.pdf
--- a/src/AlarmHandler.cpp
+++ b/src/AlarmHandler.cpp
--- a/src/AlarmHandler.h
+++ b/src/AlarmHandler.h
@@ -33,7 +33,7 @@
 #ifndef AlarmHandler_H
 #define AlarmHandler_H

-#include <tango.h>
+#include <tango/tango.h>

 #include <boost/version.hpp>
 #if BOOST_VERSION  >= 103600
@@ -61,7 +61,15 @@ class update_thread;
 #	define	ELAPSED(before, after)	\
 		1000.0*(after.tv_sec-before.tv_sec) + \
 		((double)after.tv_usec-before.tv_usec) / 1000
-
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+#ifndef TANGO_LOG_INFO
+#define TANGO_LOG_INFO cout2
+#endif
+#ifndef TANGO_LOG_DEBUG
+#define TANGO_LOG_DEBUG cout4
+#endif


 /*----- PROTECTED REGION END -----*/	//	AlarmHandler.h
@@ -585,13 +593,13 @@ private:
 	void init_alarms(map< string,vector<string> > &alarm_events);
 #endif
 	void add_alarm(alarm_t& a, bool starting=false);
-	void add_event(alarm_t& a, vector<string> &evn) throw(string&);
+	void add_event(alarm_t& a, vector<string> &evn);
 #if 0
-	void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn) throw(string&);
+	void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn);
 #endif
 //	void do_alarm(bei_t& e);											//gcc 4 problem??
-	bool remove_alarm(string& s) throw(string&);
-	//void add_to_database(alarm_t& a) throw(string&);
+	bool remove_alarm(string& s);
+	//void add_to_database(alarm_t& a);
 	void set_internal_alarm(string name, Tango::TimeVal t, string msg, unsigned int count=1);
 	
 	void load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn);
@@ -599,7 +607,8 @@ private:
 	formula_res_t eval_formula(tree_parse_info_t tree, string &attr_values);
 	void find_event_formula(tree_parse_info_t tree, vector<string> &);
 	
-	formula_res_t eval_expression(iter_t const& i, string &attr_values, int ev_ind=0);			//recursive tree node evaluation
+	formula_res_t eval_expression(iter_t const& i, string &attr_values, vector< vector<double> > ev_ind={});			//recursive tree node evaluation
+	void eval_index_range(iter_t const& i, string &attr_values, vector<double> & ind);
 	void eval_node_event(iter_t const& i, vector<string> & ev);		//recursive tree node evaluation		

 	void prepare_alarm_attr();	//for read attribute alarm and push_change_event

--- a/src/AlarmHandlerClass.cpp
+++ b/src/AlarmHandlerClass.cpp
 /*----- PROTECTED REGION ID(AlarmHandlerClass.cpp) ENABLED START -----*/
-static const char *RcsId      = "$Id:  $";
-static const char *TagName    = "$Name:  $";
-static const char *CvsPath    = "$Source:  $";
-static const char *SvnPath    = "$HeadURL:  $";
-static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc/ds_doc/";
 //=============================================================================
 //
 // file :        AlarmHandlerClass.cpp
@@ -78,7 +73,7 @@ AlarmHandlerClass *AlarmHandlerClass::_instance = NULL;
 //--------------------------------------------------------
 AlarmHandlerClass::AlarmHandlerClass(string &s):Tango::DeviceClass(s)
 {
-	cout2 << "Entering AlarmHandlerClass constructor" << endl;
+	TANGO_LOG_INFO << "Entering AlarmHandlerClass constructor" << endl;
 	set_default_property();
 	get_class_property();
 	write_class_property();
@@ -87,7 +82,7 @@ AlarmHandlerClass::AlarmHandlerClass(string &s):Tango::DeviceClass(s)
 	
 	/*----- PROTECTED REGION END -----*/	//	AlarmHandlerClass::constructor

-	cout2 << "Leaving AlarmHandlerClass constructor" << endl;
+	TANGO_LOG_INFO << "Leaving AlarmHandlerClass constructor" << endl;
 }

 //--------------------------------------------------------
@@ -167,7 +162,7 @@ AlarmHandlerClass *AlarmHandlerClass::instance()
 //--------------------------------------------------------
 CORBA::Any *AckClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "AckClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "AckClass::execute(): arrived" << endl;
 	const Tango::DevVarStringArray *argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->ack(argin));
@@ -187,7 +182,7 @@ CORBA::Any *AckClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_an
 //--------------------------------------------------------
 CORBA::Any *LoadClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "LoadClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "LoadClass::execute(): arrived" << endl;
 	Tango::DevString argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->load(argin));
@@ -207,7 +202,7 @@ CORBA::Any *LoadClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_a
 //--------------------------------------------------------
 CORBA::Any *RemoveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "RemoveClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "RemoveClass::execute(): arrived" << endl;
 	Tango::DevString argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->remove(argin));
@@ -227,7 +222,7 @@ CORBA::Any *RemoveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
 //--------------------------------------------------------
 CORBA::Any *SearchAlarmClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "SearchAlarmClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "SearchAlarmClass::execute(): arrived" << endl;
 	Tango::DevString argin;
 	extract(in_any, argin);
 	return insert((static_cast<AlarmHandler *>(device))->search_alarm(argin));
@@ -246,7 +241,7 @@ CORBA::Any *SearchAlarmClass::execute(Tango::DeviceImpl *device, const CORBA::An
 //--------------------------------------------------------
 CORBA::Any *StopAudibleClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))
 {
-	cout2 << "StopAudibleClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "StopAudibleClass::execute(): arrived" << endl;
 	((static_cast<AlarmHandler *>(device))->stop_audible());
 	return new CORBA::Any();
 }
@@ -264,7 +259,7 @@ CORBA::Any *StopAudibleClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(co
 //--------------------------------------------------------
 CORBA::Any *SilenceClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "SilenceClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "SilenceClass::execute(): arrived" << endl;
 	const Tango::DevVarStringArray *argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->silence(argin));
@@ -284,7 +279,7 @@ CORBA::Any *SilenceClass::execute(Tango::DeviceImpl *device, const CORBA::Any &i
 //--------------------------------------------------------
 CORBA::Any *ModifyClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "ModifyClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "ModifyClass::execute(): arrived" << endl;
 	Tango::DevString argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->modify(argin));
@@ -304,7 +299,7 @@ CORBA::Any *ModifyClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
 //--------------------------------------------------------
 CORBA::Any *ShelveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "ShelveClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "ShelveClass::execute(): arrived" << endl;
 	const Tango::DevVarStringArray *argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->shelve(argin));
@@ -324,7 +319,7 @@ CORBA::Any *ShelveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
 //--------------------------------------------------------
 CORBA::Any *EnableClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "EnableClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "EnableClass::execute(): arrived" << endl;
 	Tango::DevString argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->enable(argin));
@@ -344,7 +339,7 @@ CORBA::Any *EnableClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
 //--------------------------------------------------------
 CORBA::Any *DisableClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "DisableClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "DisableClass::execute(): arrived" << endl;
 	Tango::DevString argin;
 	extract(in_any, argin);
 	((static_cast<AlarmHandler *>(device))->disable(argin));
@@ -364,7 +359,7 @@ CORBA::Any *DisableClass::execute(Tango::DeviceImpl *device, const CORBA::Any &i
 //--------------------------------------------------------
 CORBA::Any *ResetStatisticsClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))
 {
-	cout2 << "ResetStatisticsClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "ResetStatisticsClass::execute(): arrived" << endl;
 	((static_cast<AlarmHandler *>(device))->reset_statistics());
 	return new CORBA::Any();
 }
@@ -382,7 +377,7 @@ CORBA::Any *ResetStatisticsClass::execute(Tango::DeviceImpl *device, TANGO_UNUSE
 //--------------------------------------------------------
 CORBA::Any *StopNewClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))
 {
-	cout2 << "StopNewClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "StopNewClass::execute(): arrived" << endl;
 	((static_cast<AlarmHandler *>(device))->stop_new());
 	return new CORBA::Any();
 }
@@ -400,7 +395,7 @@ CORBA::Any *StopNewClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const
 //--------------------------------------------------------
 CORBA::Any *GetAlarmInfoClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "GetAlarmInfoClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "GetAlarmInfoClass::execute(): arrived" << endl;
 	const Tango::DevVarStringArray *argin;
 	extract(in_any, argin);
 	return insert((static_cast<AlarmHandler *>(device))->get_alarm_info(argin));
@@ -419,7 +414,7 @@ CORBA::Any *GetAlarmInfoClass::execute(Tango::DeviceImpl *device, const CORBA::A
 //--------------------------------------------------------
 CORBA::Any *ReLoadAllClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))
 {
-	cout2 << "ReLoadAllClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "ReLoadAllClass::execute(): arrived" << endl;
 	((static_cast<AlarmHandler *>(device))->re_load_all());
 	return new CORBA::Any();
 }
@@ -789,7 +784,7 @@ void AlarmHandlerClass::device_factory(const Tango::DevVarStringArray *devlist_p
 	//	Create devices and add it into the device list
 	for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
 	{
-		cout4 << "Device name : " << (*devlist_ptr)[i].in() << endl;
+		TANGO_LOG_DEBUG << "Device name : " << (*devlist_ptr)[i].in() << endl;
 		device_list.push_back(new AlarmHandler(this, (*devlist_ptr)[i]));
 	}

@@ -1437,7 +1432,7 @@ void AlarmHandlerClass::create_static_attribute_list(vector<Tango::Attr *> &att_
 		defaultAttList.push_back(att_name);
 	}

-	cout2 << defaultAttList.size() << " attributes in default list" << endl;
+	TANGO_LOG_INFO << defaultAttList.size() << " attributes in default list" << endl;

 	/*----- PROTECTED REGION ID(AlarmHandlerClass::create_static_att_list) ENABLED START -----*/
 	
@@ -1473,7 +1468,7 @@ void AlarmHandlerClass::erase_dynamic_attributes(const Tango::DevVarStringArray
 			vector<string>::iterator ite_str = find(defaultAttList.begin(), defaultAttList.end(), att_name);
 			if (ite_str == defaultAttList.end())
 			{
-				cout2 << att_name << " is a UNWANTED dynamic attribute for device " << (*devlist_ptr)[i] << endl;
+				TANGO_LOG_INFO << att_name << " is a UNWANTED dynamic attribute for device " << (*devlist_ptr)[i] << endl;
 				Tango::Attribute &att = dev->get_device_attr()->get_attr_by_name(att_name.c_str());
 				dev->remove_attribute(att_list[att.get_attr_idx()], true, false);
 				--ite_att;

--- a/src/AlarmHandlerClass.h
+++ b/src/AlarmHandlerClass.h
@@ -37,7 +37,7 @@
 #ifndef AlarmHandlerClass_H
 #define AlarmHandlerClass_H

-#include <tango.h>
+#include <tango/tango.h>
 #include <AlarmHandler.h>



--- a/src/ClassFactory.cpp
+++ b/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

--- a/src/SubscribeThread.cpp
+++ b/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"


--- a/src/SubscribeThread.h
+++ b/src/SubscribeThread.h
-//=============================================================================
-//
-// file :        HdbEventHandler.h
-//
-// description : Include for the HDbDevice class.
-//
-// project :	Tango Device Server
-//
-// $Author: graziano $
-//
-// $Revision: 1.5 $
-//
-// $Log: SubscribeThread.h,v $
-// Revision 1.5  2014-03-06 15:21:43  graziano
-// StartArchivingAtStartup,
-// start_all and stop_all,
-// archiving of first event received at subscribe
-//
-// Revision 1.4  2013-09-24 08:42:21  graziano
-// bug fixing
-//
-// Revision 1.3  2013-09-02 12:11:32  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
-//
-//=============================================================================
-
 #ifndef _SUBSCRIBE_THREAD_H
 #define _SUBSCRIBE_THREAD_H

-#include <tango.h>
-#include <eventconsumer.h>
+#include <tango/tango.h>
 #include <stdint.h>
 #include "event_table.h"

-/**
- * @author	$Author: graziano $
- * @version	$Revision: 1.5 $
- */
-
- //	constants definitions here.
- //-----------------------------------------------
+//	constants definitions here.
+//-----------------------------------------------

 namespace AlarmHandler_ns
 {

--- a/src/alarm-thread.cpp
+++ b/src/alarm-thread.cpp
 /*
 * alarm-thread.cpp
 *
- * $Author: claudio $
- *
- * $Revision: 1.7 $
- *
- * $Log: alarm-thread.cpp,v $
- * Revision 1.7  2015-07-21 13:40:59  claudio
- * minor cleanups
- *
- * Revision 1.6  2013-03-06 10:41:11  claudio
- * commented out debug print statements
- *
- * Revision 1.5  2008-07-08 12:11:39  graziano
- * omni_thread_fatal exception handling
- *
- * Revision 1.4  2008/07/07 09:13:12  graziano
- * omni_thread_fatal exception handling
- *
- * Revision 1.3  2008/04/24 06:51:34  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
@@ -36,7 +14,7 @@ static const char __FILE__rev[] = __FILE__ " $Revision: 1.7 $";
 */
 alarm_thread::alarm_thread(AlarmHandler_ns::AlarmHandler *p) : p_Alarm(p)
 {
-	//cout << __FILE__rev << endl;
+	//TANGO_LOG << __FILE__rev << endl;
 }

 /*
@@ -142,21 +120,21 @@ void alarm_thread::run(void *)
 			ostringstream err;
 			err << "omni_thread_fatal exception running alarm thread, err=" << ex.error << ends;
 			//WARN_STREAM << "alarm_thread::run(): " << err.str() << endl;	
-			printf("alarm_thread::run(): %s", err.str().c_str());
+			printf("alarm_thread::run(): %s\n", err.str().c_str());
 		}			
 		catch(Tango::DevFailed& ex)
 		{
 			ostringstream err;
 			err << "exception running alarm thread: '" << ex.errors[0].desc << "'" << ends;
 			//WARN_STREAM << "alarm_thread::run(): " << err.str() << endl;	
-			printf("alarm_thread::run(): %s", err.str().c_str());
-			Tango::Except::print_exception(ex);
+			printf("alarm_thread::run(): %s\n", err.str().c_str());
+			//Tango::Except::print_exception(ex);
 		}		
 		catch(...)
 		{
 			//WARN_STREAM << "alarm_thread::run(): catched unknown exception!!" << endl;
-			printf("alarm_thread::run(): catched unknown exception!!");
+			printf("alarm_thread::run(): catched unknown exception!!\n");
 		}		
 	}
-	//cout << "alarm_thread::run(): returning" << endl;
+	//TANGO_LOG << "alarm_thread::run(): returning" << endl;
 }  /* alarm_thread::run() */
--- a/src/alarm-thread.h
+++ b/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"
No results found