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/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
 {
@@ -82,6 +38,7 @@ public:
 	int			period;
 	SubscribeThread(AlarmHandler *dev);
 	void updateProperty();
+	void signal();
 	/**
 	 *	Execute the thread loop.
 	 *	This thread is awaken when a command has been received 

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() */

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"

src/alarm_grammar.h

 /*
  * alarm_grammar.h
  *
- * $Author:  $
- *
- * $Revision:  $
- *
- * $Log: alarm_grammar.h,v $
- *
- *
  * copyleft: Sincrotrone Trieste S.C.p.A. di interesse nazionale
  *           Strada Statale 14 - km 163,5 in AREA Science Park
  *           34012 Basovizza, Trieste ITALY
@@ -78,13 +71,14 @@
 #define URL_KEY			"url"
 #define ON_COMMAND_KEY		"on_command"
 #define OFF_COMMAND_KEY		"off_command"
+#define RECEIVERS_KEY		"receivers"
 #define ENABLED_KEY			"enabled"
 
 #define SILENT_TIME_REMAINING_KEY		"shlvd_end"
 #define SHELVED_KEY			"shelved"
 #define ACKNOWLEDGED_KEY	"ack"
 #define ATTR_VALUES_KEY		"values"
-#define VALUE_KEY			"state"
+#define VALUE_KEY				"state"
 #define ON_COUNTER_KEY		"on_counter"
 #define OFF_COUNTER_KEY		"off_counter"
 #define COUNTER_KEY			"counter"
@@ -93,6 +87,8 @@
 #define AUDIBLE_KEY			"audible"
 #define FREQ_COUNTER_KEY	"freq_counter"
 #define ALARM_TIME_KEY		"time"
+#define EVENT_KEY				"event"
+#define EVENT_TIME_KEY		ALARM_TIME_KEY
 #define KEY(S_VAL)  		S_VAL "="
 
 #define SEP					";"
@@ -226,6 +222,7 @@ struct alarm_parse : public grammar<alarm_parse>
 					no_node_d[separator] >> no_node_d[url] |
 					no_node_d[separator] >> no_node_d[on_command] |
 					no_node_d[separator] >> no_node_d[off_command] |
+					no_node_d[separator] >> no_node_d[receivers] |
 					no_node_d[separator] >> no_node_d[enabled]
 			;
 
@@ -340,6 +337,16 @@ struct alarm_parse : public grammar<alarm_parse>
 						]		//discard_node_d
 						| epsilon_p)
 				;
+			//------------------------------RECEIVERS------------------------------------	
+			receivers
+				=	discard_node_d[str_p(KEY(RECEIVERS_KEY))]
+					//>> ch_p('"')
+					>> (*(escChar | (anychar_p - ';'))) 		//zero ore more char except ';'
+							[
+								assign_a(self.m_alarm.receivers)
+							]					
+					//>> '"'
+				;
 			//------------------------------ENABLED----------------------------------------
 			enabled
 				=	discard_node_d[str_p(KEY(ENABLED_KEY))] >>
@@ -359,7 +366,7 @@ struct alarm_parse : public grammar<alarm_parse>
 		rule_t expression, event, option;
         rule<typename lexeme_scanner<ScannerT>::type> symbol;					//needed to use lexeme_d in rule name
         rule<typename lexeme_scanner<ScannerT>::type> symbol_attr_name;		//needed to use lexeme_d in rule name
-        rule_t name, name_alm, val, token, oper, msg, url, group, level, on_delay, off_delay, silent_time, on_command, off_command, enabled, separator,escChar;
+        rule_t name, name_alm, val, token, oper, msg, url, group, level, on_delay, off_delay, silent_time, on_command, off_command, receivers, enabled, separator,escChar;
 		formula_grammar formula;
 		
 		rule_t const&					

src/cmd_thread.cpp

 /*
  * cmd_thread.cpp
  *
- * $Author: claudio $
- *
- * $Revision: 1.3 $
- *
- * $Log: cmd_thread.cpp,v $
- * Revision 1.3  2015-07-21 13:40:59  claudio
- * minor cleanups
- *
- * Revision 1.2  2008-11-17 13:13:21  graziano
- * command action can be: without arguments or with string argument
- *
- * Revision 1.1  2008/11/10 10:53:31  graziano
- * thread for execution of commands
- *
- *
- *
- *
- *
  * copyleft: Sincrotrone Trieste S.C.p.A. di interesse nazionale
  *           Strada Statale 14 - km 163,5 in AREA Science Park
  *           34012 Basovizza, Trieste ITALY
@@ -32,8 +14,8 @@ static const char __FILE__rev[] = __FILE__ " $Revision: 1.3 $";
  */
 cmd_thread::cmd_thread() 
 {
-	cout << __FILE__rev << endl;
-	cout << gettime().tv_sec << " cmd_thread::cmd_thread(): constructor... !" << endl;	
+	TANGO_LOG << __FILE__rev << endl;
+	TANGO_LOG << gettime().tv_sec << " cmd_thread::cmd_thread(): constructor... !" << endl;	
 	//mutex_dp = new omni_mutex::omni_mutex();
 }
 
@@ -42,7 +24,7 @@ cmd_thread::cmd_thread()
  */
 cmd_thread::~cmd_thread()
 {
-	cout << gettime().tv_sec << " cmd_thread::~cmd_thread(): delete device entering..." << endl;
+	TANGO_LOG << gettime().tv_sec << " cmd_thread::~cmd_thread(): delete device entering..." << endl;
 	//delete mutex_dp;	
 }
 
@@ -62,13 +44,13 @@ void cmd_thread::run(void *)
 			switch(cmd.cmd_id)
 			{
 				case CMD_THREAD_EXIT:
-					cout << gettime().tv_sec << " cmd_thread::run(): received command THREAD_EXIT -> exiting..." << endl;				
+					TANGO_LOG << gettime().tv_sec << " cmd_thread::run(): received command THREAD_EXIT -> exiting..." << endl;				
 				return;
 				
 				case CMD_COMMAND:
 				{
 					try {
-						cout << gettime().tv_sec << " cmd_thread::run(): COMMAND ... action=" << cmd.arg_s3 << endl;
+						TANGO_LOG << gettime().tv_sec << " cmd_thread::run(): COMMAND ... action=" << cmd.arg_s3 << endl;
 						dp = (Tango::DeviceProxy *)cmd.dp_add;
 						if(cmd.arg_b)
 						{
@@ -82,7 +64,7 @@ void cmd_thread::run(void *)
 						}
 						else
 							call_id = dp->command_inout_asynch(cmd.arg_s2);
-						cout << gettime().tv_sec <<  " cmd_thread::run() executed action: " << cmd.arg_s3 << " !!! call_id=" << call_id << endl;
+						TANGO_LOG << gettime().tv_sec <<  " cmd_thread::run() executed action: " << cmd.arg_s3 << " !!! call_id=" << call_id << endl;
 						/*cmd_t arg;
 						arg.cmd_id = CMD_RESPONSE;
 						arg.call_id = call_id;
@@ -101,11 +83,11 @@ void cmd_thread::run(void *)
 						if(err.find("is not yet arrived") == string::npos)			//TODO: change this!!
 						{
 							out_stream << "Failed to execute action " << cmd.arg_s3 << ", err=" << e.errors[0].desc << ends;
-							cout << gettime().tv_sec <<  " cmd_thread::run() ERROR: " << out_stream.str() << endl;
+							TANGO_LOG << gettime().tv_sec <<  " cmd_thread::run() ERROR: " << out_stream.str() << endl;
 						}
 						else
 						{
-							cout << gettime().tv_sec <<  " cmd_thread::run() exception 'is not yet arrived': pushing request of response, call_id=" << call_id << endl;
+							TANGO_LOG << gettime().tv_sec <<  " cmd_thread::run() exception 'is not yet arrived': pushing request of response, call_id=" << call_id << endl;
 							cmd.cmd_id = CMD_RESPONSE;			//if no exception till now push in list request of response
 							cmd.call_id = call_id;				//if no exception till now push in list request of response
 							list.push_back(cmd);		//if no exception till now push in list request of response						
@@ -117,12 +99,12 @@ void cmd_thread::run(void *)
 				
 				case CMD_RESPONSE:
 				{
-					//cout << gettime().tv_sec << " cmd_thread::run(): RESPONSE WAKE UP... action=" << cmd.arg_s3 << " call_id=" << cmd.call_id << endl;
+					//TANGO_LOG << gettime().tv_sec << " cmd_thread::run(): RESPONSE WAKE UP... action=" << cmd.arg_s3 << " call_id=" << cmd.call_id << endl;
 					Tango::DeviceData resp;
 					dp = (Tango::DeviceProxy *)cmd.dp_add;
 					try {
 						resp = dp->command_inout_reply(cmd.call_id);
-						cout << gettime().tv_sec << " cmd_thread::run() RECEIVED response to action " << cmd.arg_s3 << endl;
+						TANGO_LOG << gettime().tv_sec << " cmd_thread::run() RECEIVED response to action " << cmd.arg_s3 << endl;
 					} catch(Tango::DevFailed &e)
 					{
 						TangoSys_MemStream out_stream;
@@ -136,7 +118,7 @@ void cmd_thread::run(void *)
 						}
 						else
 						{
-							cout << gettime().tv_sec << " cmd_thread::run() " <<  out_stream.str() << endl;
+							TANGO_LOG << gettime().tv_sec << " cmd_thread::run() " <<  out_stream.str() << endl;
 							Tango::Except::print_exception(e);
 						}
 					}				
@@ -145,19 +127,19 @@ void cmd_thread::run(void *)
 			}
 /*			if(cmd.arg_s == CMD_THREAD_EXIT)
 			{
-				cout << gettime().tv_sec << " cmd_thread::run(): received command THREAD_EXIT -> exiting..." << endl;				
+				TANGO_LOG << gettime().tv_sec << " cmd_thread::run(): received command THREAD_EXIT -> exiting..." << endl;				
 				return;
 			}
 			else
 			{
-				cout << gettime().tv_sec << " cmd_thread::run(): WAKE UP... action=" << cmd.arg_s << endl;
+				TANGO_LOG << gettime().tv_sec << " cmd_thread::run(): WAKE UP... action=" << cmd.arg_s << endl;
 				Tango::DeviceData resp;
 				dp = (Tango::DeviceProxy *)cmd.dp_add;
 				try {
 					mutex_dp->lock();
 					resp = dp->command_inout_reply(cmd.cmd_id);
 					mutex_dp->unlock();
-					cout << gettime().tv_sec << " cmd_thread::run() received response to action " << cmd.arg_s << endl;
+					TANGO_LOG << gettime().tv_sec << " cmd_thread::run() received response to action " << cmd.arg_s << endl;
 				} catch(Tango::DevFailed &e)
 				{
 					TangoSys_MemStream out_stream;
@@ -170,7 +152,7 @@ void cmd_thread::run(void *)
 						omni_thread::sleep(0,300000000);	//0.2 s
 					}
 					else
-						cout << gettime().tv_sec << " cmd_thread::run() " <<  out_stream.str() << endl;
+						TANGO_LOG << gettime().tv_sec << " cmd_thread::run() " <<  out_stream.str() << endl;
 				}
 			}*/
 			
@@ -196,7 +178,7 @@ void cmd_thread::run(void *)
 			printf("cmd_thread::run(): catched unknown exception!!");
 		}		
 	}
-	//cout << "alarm_thread::run(): returning" << endl;
+	//TANGO_LOG << "alarm_thread::run(): returning" << endl;
 }  /* cmd_thread::run() */
 
 /*
@@ -206,7 +188,7 @@ void cmd_list::push_back(cmd_t& cmd)
 {
 	this->lock();
 
-	//cout << "cmd_list::push_back: cmd_id=" << cmd.cmd_id << " call_id=" << cmd.call_id << endl;
+	//TANGO_LOG << "cmd_list::push_back: cmd_id=" << cmd.cmd_id << " call_id=" << cmd.call_id << endl;
 	try{
 		l_cmd.push_back(cmd);		
 		empty.signal();
@@ -273,7 +255,7 @@ const cmd_t cmd_list::pop_front(void)
 	/*const*/ cmd_t cmd;
 
 	cmd = *(l_cmd.begin());
-	//cout << "cmd_list::pop_front: " << e.name << " value=" << e.value[0] << endl;
+	//TANGO_LOG << "cmd_list::pop_front: " << e.name << " value=" << e.value[0] << endl;
 	l_cmd.pop_front();
 
 	this->unlock();

src/cmd_thread.h

 /*
- *cmd_thread.h
- *
- * $Author: graziano $
- *
- * $Revision: 1.2 $
- *
- * $Log: cmd_thread.h,v $
- * Revision 1.2  2008-11-17 13:10:36  graziano
- * command action can be: without arguments or with string argument
- *
- * Revision 1.1  2008/11/10 10:53:31  graziano
- * thread for execution of commands
- *
- * Revision 1.2  2008/10/07 14:03:07  graziano
- * added handling of multi axis groups and spindle groups
- *
- * Revision 1.1  2008/09/30 09:46:32  graziano
- * first version
- *
- * Revision 1.3  2008/04/23 15:00:57  graziano
- * small code cleanings
- *
- *
+ * cmd_thread.h
  *
  * copyleft: Sincrotrone Trieste S.C.p.A. di interesse nazionale
  *           Strada Statale 14 - km 163,5 in AREA Science Park
@@ -41,7 +19,7 @@
 #define CMD_THREAD_EXIT	3
 
 #include <omnithread.h>
-#include <tango.h>
+#include <tango/tango.h>
 #include "AlarmHandler.h"
 
 struct cmd_t

src/main.cpp

@@ -31,7 +31,7 @@
 //                This file is generated by POGO
 //        (Program Obviously used to Generate tango Object)
 //=============================================================================
-#include <tango.h>
+#include <tango/tango.h>
 
 // Check if crash reporting is used.
 #if defined(ENABLE_CRASH_REPORT)
@@ -43,8 +43,15 @@
 
 DECLARE_CRASH_HANDLER;
 
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+
+
 int main(int argc,char *argv[])
 {
+    using std::endl;
+    using std::bad_alloc;
 	INSTALL_CRASH_HANDLER
 	try
 	{
@@ -59,20 +66,20 @@ int main(int argc,char *argv[])
 
 		// Run the endless loop
 		//----------------------------------------
-		cout << "Ready to accept request" << endl;
+		TANGO_LOG << "Ready to accept request" << endl;
 		tg->server_run();
 	}
 	catch (bad_alloc &)
 	{
-		cout << "Can't allocate memory to store device object !!!" << endl;
-		cout << "Exiting" << endl;
+		TANGO_LOG << "Can't allocate memory to store device object !!!" << endl;
+		TANGO_LOG << "Exiting" << endl;
 	}
 	catch (CORBA::Exception &e)
 	{
 		Tango::Except::print_exception(e);
 		
-		cout << "Received a CORBA_Exception" << endl;
-		cout << "Exiting" << endl;
+		TANGO_LOG << "Received a CORBA_Exception" << endl;
+		TANGO_LOG << "Exiting" << endl;
 	}
 	Tango::Util::instance()->server_cleanup();
 	return(0);