From 054ececd6de09fd129493d4f41d8167be6638c98 Mon Sep 17 00:00:00 2001
From: gscalamera <graziano.scalamera@elettra.eu>
Date: Tue, 11 Apr 2017 11:23:35 +0200
Subject: [PATCH] Renamed from Alarm to AlarmHandler
---
Makefile | 2 +-
src/AlarmHandler.cpp | 624 +++++++++++++++----------------
src/AlarmHandler.h | 59 ++-
src/AlarmHandler.xmi | 4 +-
src/AlarmHandlerClass.cpp | 189 +++++-----
src/AlarmHandlerClass.h | 132 ++++---
src/AlarmHandlerDynAttrUtils.cpp | 56 ++-
src/AlarmHandlerStateMachine.cpp | 224 ++++++-----
src/ClassFactory.cpp | 67 ++--
src/SubscribeThread.cpp | 6 +-
src/SubscribeThread.h | 8 +-
src/alarm-thread.cpp | 2 +-
src/alarm-thread.h | 6 +-
src/cmd_thread.h | 2 +-
src/event_table.cpp | 74 ++--
src/main.cpp | 41 +-
src/update-thread.cpp | 2 +-
src/update-thread.h | 6 +-
18 files changed, 729 insertions(+), 775 deletions(-)
diff --git a/Makefile b/Makefile
index d2f79b9..cef07f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME_SRV = alarm-srv
+NAME_SRV = alarmhandler-srv
diff --git a/src/AlarmHandler.cpp b/src/AlarmHandler.cpp
index 5ddca92..f514d03 100644
--- a/src/AlarmHandler.cpp
+++ b/src/AlarmHandler.cpp
@@ -1,16 +1,15 @@
-/*----- PROTECTED REGION ID(Alarm.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: $";
+/*----- PROTECTED REGION ID(AlarmHandler.cpp) ENABLED START -----*/
//=============================================================================
//
-// file : Alarm.cpp
+// file : AlarmHandler.cpp
//
-// description : C++ source for the Alarm class and its commands.
+// description : C++ source for the AlarmHandler class and its commands.
// The class is derived from Device. It represents the
// CORBA servant object which will be accessed from the
// network. All commands which can be executed on the
-// Alarm are implemented in this file.
+// AlarmHandler are implemented in this file.
//
-// project : alarm
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -27,12 +26,7 @@ static const char *RcsId = "$Id: $";
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
@@ -40,9 +34,8 @@ static const char *RcsId = "$Id: $";
//=============================================================================
-#include <tango.h>
-#include <Alarm.h>
-#include <AlarmClass.h>
+#include <AlarmHandler.h>
+#include <AlarmHandlerClass.h>
#include <ctype.h> //for tolower
#include "alarm-thread.h"
@@ -78,7 +71,7 @@ using namespace boost::spirit::classic;
std::map<parser_id, std::string> rule_names; //only for log messages
-int Alarm_ns::Alarm::instanceCounter = 0;
+int AlarmHandler_ns::AlarmHandler::instanceCounter = 0;
#ifndef ALARM_BUILDTIME
#define ALARM_BUILDTIME __DATE__ " " __TIME__ " boost=" BOOST_LIB_VERSION
@@ -87,11 +80,11 @@ int Alarm_ns::Alarm::instanceCounter = 0;
const char version_string[] = "$Build: @buildID@ " ALARM_BUILDTIME " $";
static const char __FILE__rev[] = __FILE__ " $Revision: 1.29 $";
-/*----- PROTECTED REGION END -----*/ // Alarm.cpp
+/*----- PROTECTED REGION END -----*/ // AlarmHandler.cpp
/**
- * Alarm class description:
- * Elettra alarm device server
+ * AlarmHandler class description:
+ * Elettra alarm handler device server
*/
//================================================================
@@ -132,62 +125,61 @@ static const char __FILE__rev[] = __FILE__ " $Revision: 1.29 $";
// frequencyAlarms | Tango::DevDouble Spectrum ( max = 10000)
//================================================================
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
-/*----- PROTECTED REGION ID(Alarm::namespace_starting) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::namespace_starting) ENABLED START -----*/
// static initializations
-/*----- PROTECTED REGION END -----*/ // Alarm::namespace_starting
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::namespace_starting
//--------------------------------------------------------
/**
- * Method : Alarm::Alarm()
+ * Method : AlarmHandler::AlarmHandler()
* Description : Constructors for a Tango device
- * implementing the classAlarm
+ * implementing the classAlarmHandler
*/
//--------------------------------------------------------
-Alarm::Alarm(Tango::DeviceClass *cl, string &s)
+AlarmHandler::AlarmHandler(Tango::DeviceClass *cl, string &s)
: TANGO_BASE_CLASS(cl, s.c_str())
{
- /*----- PROTECTED REGION ID(Alarm::constructor_1) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::constructor_1) ENABLED START -----*/
init_device();
- /*----- PROTECTED REGION END -----*/ // Alarm::constructor_1
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::constructor_1
}
//--------------------------------------------------------
-Alarm::Alarm(Tango::DeviceClass *cl, const char *s)
+AlarmHandler::AlarmHandler(Tango::DeviceClass *cl, const char *s)
: TANGO_BASE_CLASS(cl, s)
{
- /*----- PROTECTED REGION ID(Alarm::constructor_2) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::constructor_2) ENABLED START -----*/
init_device();
- /*----- PROTECTED REGION END -----*/ // Alarm::constructor_2
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::constructor_2
}
//--------------------------------------------------------
-Alarm::Alarm(Tango::DeviceClass *cl, const char *s, const char *d)
+AlarmHandler::AlarmHandler(Tango::DeviceClass *cl, const char *s, const char *d)
: TANGO_BASE_CLASS(cl, s, d)
{
- /*----- PROTECTED REGION ID(Alarm::constructor_3) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::constructor_3) ENABLED START -----*/
init_device();
- /*----- PROTECTED REGION END -----*/ // Alarm::constructor_3
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::constructor_3
}
//--------------------------------------------------------
/**
- * Method : Alarm::delete_device()
+ * Method : AlarmHandler::delete_device()
* Description : will be called at device destruction or at init command
*/
//--------------------------------------------------------
-void Alarm::delete_device()
+void AlarmHandler::delete_device()
{
- DEBUG_STREAM << "Alarm::delete_device() " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::delete_device) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::delete_device() " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::delete_device) ENABLED START -----*/
// Delete device allocated objects
- // Delete device's allocated object
- /*
+ /*
* unsubscribe events and release memory
*/
bool starting = Tango::Util::instance()->is_svr_starting();
@@ -196,13 +188,13 @@ void Alarm::delete_device()
DEBUG_STREAM << __func__ << " starting="<<(int)starting << " shutting_down="<<(int)shutting_down<<" restarting="<<(int)restarting;
abortflag = true;
- DEBUG_STREAM << "Alarm::delete_device(): after abortflag=true..." << endl;
+ DEBUG_STREAM << "AlarmHandler::delete_device(): after abortflag=true..." << endl;
try {
events->unsubscribe_events();
} catch (string& err) {
ERROR_STREAM << err << endl;
}
- DEBUG_STREAM << "Alarm::delete_device(): events unsubscribed!" << endl;
+ DEBUG_STREAM << "AlarmHandler::delete_device(): events unsubscribed!" << endl;
/*
* kill alarm thread
*/
@@ -215,7 +207,7 @@ void Alarm::delete_device()
alarms.stop_cmdthread();
sleep(1); //wait for alarm_thread and log_thread to exit
//delete almloop;
- DEBUG_STREAM << "Alarm::delete_device(): stopped alarm and log threads!" << endl;
+ DEBUG_STREAM << "AlarmHandler::delete_device(): stopped alarm and log threads!" << endl;
//delete proxy for actions
@@ -304,10 +296,10 @@ void Alarm::delete_device()
delete internallock;
delete dslock;
delete events;
- DEBUG_STREAM << "Alarm::delete_device(): saved AlarmStatus in properties!!" << endl;
+ DEBUG_STREAM << "AlarmHandler::delete_device(): saved AlarmStatus in properties!!" << endl;
//Tango::leavefunc();
- /*----- PROTECTED REGION END -----*/ // Alarm::delete_device
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::delete_device
delete[] attr_audibleAlarm_read;
delete[] attr_StatisticsResetTime_read;
delete[] attr_normalAlarms_read;
@@ -323,14 +315,14 @@ void Alarm::delete_device()
//--------------------------------------------------------
/**
- * Method : Alarm::init_device()
+ * Method : AlarmHandler::init_device()
* Description : will be called at device initialization.
*/
//--------------------------------------------------------
-void Alarm::init_device()
+void AlarmHandler::init_device()
{
- DEBUG_STREAM << "Alarm::init_device() create device " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::init_device_before) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::init_device() create device " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::init_device_before) ENABLED START -----*/
bool starting = Tango::Util::instance()->is_svr_starting();
bool shutting_down = Tango::Util::instance()->is_svr_shutting_down();
bool restarting = Tango::Util::instance()->is_device_restarting(device_name);
@@ -363,7 +355,7 @@ void Alarm::init_device()
silencedAlarms_read.reserve(MAX_ALARMS);
listAlarms_read.reserve(MAX_ALARMS);
- /*----- PROTECTED REGION END -----*/ // Alarm::init_device_before
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::init_device_before
// Get the device properties from database
@@ -380,7 +372,7 @@ void Alarm::init_device()
attr_silencedAlarms_read = new Tango::DevString[10000];
attr_listAlarms_read = new Tango::DevString[10000];
attr_frequencyAlarms_read = new Tango::DevDouble[10000];
- /*----- PROTECTED REGION ID(Alarm::init_device) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::init_device) ENABLED START -----*/
// Initialize device
thread->period = subscribeRetryPeriod;
@@ -419,7 +411,7 @@ void Alarm::init_device()
alarms.init_cmdthread();
} catch(...)
{
- WARN_STREAM << "Alarm::init_device(): error creating cmd thread" << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): error creating cmd thread" << endl;
}
rule_names[formula_grammar::val_rID] = "ValReal";
@@ -480,7 +472,7 @@ void Alarm::init_device()
alarms.get_alarm_list_db(tmp_alm_vec, saved_alarms);
} catch(string & e)
{
- ERROR_STREAM << "Alarm::init_device(): " << e << endl;
+ ERROR_STREAM << "AlarmHandler::init_device(): " << e << endl;
cout << "Error: " << e << ". Exiting..." << endl;
exit(-4);
}
@@ -508,13 +500,13 @@ void Alarm::init_device()
{
ostringstream err;
err << "error loading alarm=" << tmp_alm.name << " , " << e.errors[0].desc << ends;
- WARN_STREAM << "Alarm::init_device(): " << err.str() << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
continue;
} catch (string& err) {
ostringstream err_out;
err_out << "error loading alarm=" << tmp_alm.name << " , " << err << ends;
- WARN_STREAM << "Alarm::init_device(): " << err_out.str() << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err_out.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err_out.str());
continue;
}
@@ -600,7 +592,7 @@ void Alarm::init_device()
{
ostringstream err;
err << i->second.name << ": error, command " << i->second.cmd_name_a << " does not accept a Tango::DevString or a Tango::DevVoid as input value" << ends;
- ERROR_STREAM << "Alarm::init_device(): " << err.str() << endl;
+ ERROR_STREAM << "AlarmHandler::init_device(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
}
else
@@ -609,13 +601,13 @@ void Alarm::init_device()
i->second.send_arg_a = true;
else
i->second.send_arg_a = false;
- DEBUG_STREAM << "Alarm::init_device(): " << i->second.name << ": successfully connected to proxy=" << i->second.cmd_dp_a << " for action=" << i->second.cmd_action_a << endl;
+ DEBUG_STREAM << "AlarmHandler::init_device(): " << i->second.name << ": successfully connected to proxy=" << i->second.cmd_dp_a << " for action=" << i->second.cmd_action_a << endl;
}
} catch(Tango::DevFailed& e)
{
ostringstream err;
err << i->second.name << ": error connecting to device proxy=" << i->second.cmd_dp_a << ", err=" << e.errors[0].desc << ends;
- WARN_STREAM << "Alarm::init_device(): " << err.str() << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
i->second.dp_a = NULL;
}
@@ -630,7 +622,7 @@ void Alarm::init_device()
{
ostringstream err;
err << i->second.name << ": error, command " << i->second.cmd_name_n << " does not accept a Tango::DevString or a Tango::DevVoid as input value" << ends;
- ERROR_STREAM << "Alarm::init_device(): " << err.str() << endl;
+ ERROR_STREAM << "AlarmHandler::init_device(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
}
else
@@ -639,13 +631,13 @@ void Alarm::init_device()
i->second.send_arg_n = true;
else
i->second.send_arg_n = false;
- DEBUG_STREAM << "Alarm::init_device(): " << i->second.name << ": successfully connected to proxy=" << i->second.cmd_dp_n << " for action=" << i->second.cmd_action_n << endl;
+ DEBUG_STREAM << "AlarmHandler::init_device(): " << i->second.name << ": successfully connected to proxy=" << i->second.cmd_dp_n << " for action=" << i->second.cmd_action_n << endl;
}
} catch(Tango::DevFailed& e)
{
ostringstream err;
err << i->second.name << ": error connecting to device proxy=" << i->second.cmd_dp_n << ", err=" << e.errors[0].desc << ends;
- WARN_STREAM << "Alarm::init_device(): " << err.str() << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
i->second.dp_n = NULL;
}
@@ -673,20 +665,20 @@ void Alarm::init_device()
evlist.push_back(e);
}
} catch (string& err) {
- WARN_STREAM << "Alarm::init_device(): " << err << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err << endl;
for(vector<string>::iterator j=al_ev_it->second.begin(); j!=al_ev_it->second.end(); j++)
{
- DEBUG_STREAM << "Alarm::init_device(): Removing alarm=" << i->second.name << " from event=" << *j << endl;
+ DEBUG_STREAM << "AlarmHandler::init_device(): Removing alarm=" << i->second.name << " from event=" << *j << endl;
vector<event>::iterator k = \
find(events->v_event.begin(), events->v_event.end(), *j);
if (k != events->v_event.end())
{
k->pop_alarm(i->second.name); //remove alarm/formula just added to event
- DEBUG_STREAM << "Alarm::init_device(): Removed!!!! alarm=" << i->second.name << " from event=" << *j << endl;
+ DEBUG_STREAM << "AlarmHandler::init_device(): Removed!!!! alarm=" << i->second.name << " from event=" << *j << endl;
if(k->m_alarm.empty())
{
events->v_event.erase(k); //remove event just added to event_table
- DEBUG_STREAM << "Alarm::init_device(): event=" << *j << " no more used, REMOVED!!!" << endl;
+ DEBUG_STREAM << "AlarmHandler::init_device(): event=" << *j << " no more used, REMOVED!!!" << endl;
}
}
}
@@ -696,13 +688,13 @@ void Alarm::init_device()
try {
add_event(i->second, al_ev_it->second);
} catch (string& err) {
- WARN_STREAM << "Alarm::init_device(): " << err << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err);
}
try {
subscribe_event(i->second, ecb, al_ev_it->second);
} catch (string& err) {
- WARN_STREAM << "Alarm::init_device(): " << err << endl;
+ WARN_STREAM << "AlarmHandler::init_device(): " << err << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err);
}
#endif
@@ -741,23 +733,22 @@ void Alarm::init_device()
last_statistics_reset_time = dnow;
INFO_STREAM << __func__ << ": exiting!";
- /*----- PROTECTED REGION END -----*/ // Alarm::init_device
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::init_device
}
//--------------------------------------------------------
/**
- * Method : Alarm::get_device_property()
+ * Method : AlarmHandler::get_device_property()
* Description : Read database to initialize property data members.
*/
//--------------------------------------------------------
-void Alarm::get_device_property()
+void AlarmHandler::get_device_property()
{
- /*----- PROTECTED REGION ID(Alarm::get_device_property_before) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::get_device_property_before) ENABLED START -----*/
// Initialize property data members
-
- /*----- PROTECTED REGION END -----*/ // Alarm::get_device_property_before
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::get_device_property_before
// Read device properties from database.
@@ -773,10 +764,10 @@ void Alarm::get_device_property()
if (Tango::Util::instance()->_UseDb==true)
get_db_device()->get_property(dev_prop);
- // get instance on AlarmClass to get class property
+ // get instance on AlarmHandlerClass to get class property
Tango::DbDatum def_prop, cl_prop;
- AlarmClass *ds_class =
- (static_cast<AlarmClass *>(get_device_class()));
+ AlarmHandlerClass *ds_class =
+ (static_cast<AlarmHandlerClass *>(get_device_class()));
int i = -1;
// Try to initialize GroupNames from class property
@@ -814,7 +805,7 @@ void Alarm::get_device_property()
}
- /*----- PROTECTED REGION ID(Alarm::get_device_property_after) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::get_device_property_after) ENABLED START -----*/
// Check device property data members init
/*
@@ -823,44 +814,39 @@ void Alarm::get_device_property()
alarm_t tmp_alm;
tmp_alm.init_static_map(groupNames);
- /*----- PROTECTED REGION END -----*/ // Alarm::get_device_property_after
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::get_device_property_after
}
//--------------------------------------------------------
/**
- * Method : Alarm::always_executed_hook()
+ * Method : AlarmHandler::always_executed_hook()
* Description : method always executed before any command is executed
*/
//--------------------------------------------------------
-void Alarm::always_executed_hook()
+void AlarmHandler::always_executed_hook()
{
- //DEBUG_STREAM << "Alarm::always_executed_hook() " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::always_executed_hook) ENABLED START -----*/
+ //DEBUG_STREAM << "AlarmHandler::always_executed_hook() " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::always_executed_hook) ENABLED START -----*/
// code always executed before all requests
-
- /*----- PROTECTED REGION END -----*/ // Alarm::always_executed_hook
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::always_executed_hook
}
//--------------------------------------------------------
/**
- * Method : Alarm::read_attr_hardware()
+ * Method : AlarmHandler::read_attr_hardware()
* Description : Hardware acquisition for attributes
*/
//--------------------------------------------------------
-void Alarm::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
+void AlarmHandler::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
{
- //DEBUG_STREAM << "Alarm::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_attr_hardware) ENABLED START -----*/
+ //DEBUG_STREAM << "AlarmHandler::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_attr_hardware) ENABLED START -----*/
// Add your own code
- //DEBUG_STREAM << "In read_attr_hardware for " << attr_list.size() << " attribute(s)" << endl;
- // Add your own code here
- //---------------------------------
-
- /*----- PROTECTED REGION END -----*/ // Alarm::read_attr_hardware
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_attr_hardware
}
//--------------------------------------------------------
@@ -872,14 +858,14 @@ void Alarm::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
* Attr type: Scalar
*/
//--------------------------------------------------------
-void Alarm::read_audibleAlarm(Tango::Attribute &attr)
+void AlarmHandler::read_audibleAlarm(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_audibleAlarm(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_audibleAlarm) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_audibleAlarm(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_audibleAlarm) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_audibleAlarm_read);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_audibleAlarm
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_audibleAlarm
}
//--------------------------------------------------------
/**
@@ -890,10 +876,10 @@ void Alarm::read_audibleAlarm(Tango::Attribute &attr)
* Attr type: Scalar
*/
//--------------------------------------------------------
-void Alarm::read_StatisticsResetTime(Tango::Attribute &attr)
+void AlarmHandler::read_StatisticsResetTime(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_StatisticsResetTime(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_StatisticsResetTime) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_StatisticsResetTime(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_StatisticsResetTime) ENABLED START -----*/
timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
double dnow = (now.tv_sec) + ((double)(now.tv_nsec))/1000000000;
@@ -901,7 +887,7 @@ void Alarm::read_StatisticsResetTime(Tango::Attribute &attr)
// Set the attribute value
attr.set_value(attr_StatisticsResetTime_read);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_StatisticsResetTime
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_StatisticsResetTime
}
//--------------------------------------------------------
/**
@@ -912,10 +898,10 @@ void Alarm::read_StatisticsResetTime(Tango::Attribute &attr)
* Attr type: Spectrum max = 1024
*/
//--------------------------------------------------------
-void Alarm::read_alarm(Tango::Attribute &attr)
+void AlarmHandler::read_alarm(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_alarm(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_alarm) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_alarm(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_alarm) ENABLED START -----*/
// Add your own code here
#if 0
alarm_container_t::iterator ai;
@@ -1079,7 +1065,7 @@ void Alarm::read_alarm(Tango::Attribute &attr)
else
attr.set_value(ds, ds_num, 0, false);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_alarm
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_alarm
}
//--------------------------------------------------------
/**
@@ -1090,14 +1076,14 @@ void Alarm::read_alarm(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_normalAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_normalAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_normalAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_normalAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_normalAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_normalAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_normalAlarms_read, normalAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_normalAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_normalAlarms
}
//--------------------------------------------------------
/**
@@ -1108,14 +1094,14 @@ void Alarm::read_normalAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_unacknowledgedAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_unacknowledgedAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_unacknowledgedAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_unacknowledgedAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_unacknowledgedAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_unacknowledgedAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_unacknowledgedAlarms_read, unacknowledgedAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_unacknowledgedAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_unacknowledgedAlarms
}
//--------------------------------------------------------
/**
@@ -1126,14 +1112,14 @@ void Alarm::read_unacknowledgedAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_acknowledgedAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_acknowledgedAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_acknowledgedAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_acknowledgedAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_acknowledgedAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_acknowledgedAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_acknowledgedAlarms_read, acknowledgedAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_acknowledgedAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_acknowledgedAlarms
}
//--------------------------------------------------------
/**
@@ -1144,14 +1130,14 @@ void Alarm::read_acknowledgedAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_unacknowledgedNormalAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_unacknowledgedNormalAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_unacknowledgedNormalAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_unacknowledgedNormalAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_unacknowledgedNormalAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_unacknowledgedNormalAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_unacknowledgedNormalAlarms_read, unacknowledgedNormalAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_unacknowledgedNormalAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_unacknowledgedNormalAlarms
}
//--------------------------------------------------------
/**
@@ -1162,14 +1148,14 @@ void Alarm::read_unacknowledgedNormalAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_shelvedAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_shelvedAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_shelvedAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_shelvedAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_shelvedAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_shelvedAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_shelvedAlarms_read, shelvedAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_shelvedAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_shelvedAlarms
}
//--------------------------------------------------------
/**
@@ -1180,14 +1166,14 @@ void Alarm::read_shelvedAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_outOfServiceAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_outOfServiceAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_outOfServiceAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_outOfServiceAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_outOfServiceAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_outOfServiceAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_outOfServiceAlarms_read, outOfServiceAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_outOfServiceAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_outOfServiceAlarms
}
//--------------------------------------------------------
/**
@@ -1198,14 +1184,14 @@ void Alarm::read_outOfServiceAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_silencedAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_silencedAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_silencedAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_silencedAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_silencedAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_silencedAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_silencedAlarms_read, silencedAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_silencedAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_silencedAlarms
}
//--------------------------------------------------------
/**
@@ -1216,14 +1202,14 @@ void Alarm::read_silencedAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_listAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_listAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_listAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_listAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_listAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_listAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_listAlarms_read, listAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_listAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_listAlarms
}
//--------------------------------------------------------
/**
@@ -1234,14 +1220,14 @@ void Alarm::read_listAlarms(Tango::Attribute &attr)
* Attr type: Spectrum max = 10000
*/
//--------------------------------------------------------
-void Alarm::read_frequencyAlarms(Tango::Attribute &attr)
+void AlarmHandler::read_frequencyAlarms(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_frequencyAlarms(Tango::Attribute &attr) entering... " << endl;
- /*----- PROTECTED REGION ID(Alarm::read_frequencyAlarms) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::read_frequencyAlarms(Tango::Attribute &attr) entering... " << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::read_frequencyAlarms) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_frequencyAlarms_read, listAlarms_sz);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_frequencyAlarms
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_frequencyAlarms
}
//--------------------------------------------------------
@@ -1253,11 +1239,11 @@ void Alarm::read_frequencyAlarms(Tango::Attribute &attr)
* Attr type: Scalar
*/
//--------------------------------------------------------
-void Alarm::read_AlarmState(Tango::Attribute &attr)
+void AlarmHandler::read_AlarmState(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_AlarmState(Tango::Attribute &attr) entering... " << endl;
+ DEBUG_STREAM << "AlarmHandler::read_AlarmState(Tango::Attribute &attr) entering... " << endl;
Tango::DevEnum *att_value = get_AlarmState_data_ptr(attr.get_name());
- /*----- PROTECTED REGION ID(Alarm::read_AlarmState) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::read_AlarmState) ENABLED START -----*/
string reason("");
string desc("");
string origin("");
@@ -1278,7 +1264,7 @@ void Alarm::read_AlarmState(Tango::Attribute &attr)
origin = it->second.ex_origin;
quality = it->second.quality;
}
- DEBUG_STREAM << "Alarm::read_AlarmState: " << attr.get_name() << " desc=" << desc << endl;
+ DEBUG_STREAM << "AlarmHandler::read_AlarmState: " << attr.get_name() << " desc=" << desc << endl;
alarms.vlock->readerOut();
if(desc.length() > 0)
{
@@ -1299,7 +1285,7 @@ void Alarm::read_AlarmState(Tango::Attribute &attr)
attr.set_value(att_value);
}
- /*----- PROTECTED REGION END -----*/ // Alarm::read_AlarmState
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_AlarmState
}
//--------------------------------------------------------
/**
@@ -1310,31 +1296,31 @@ void Alarm::read_AlarmState(Tango::Attribute &attr)
* Attr type: Scalar
*/
//--------------------------------------------------------
-void Alarm::read_AlarmFormula(Tango::Attribute &attr)
+void AlarmHandler::read_AlarmFormula(Tango::Attribute &attr)
{
- DEBUG_STREAM << "Alarm::read_AlarmFormula(Tango::Attribute &attr) entering... " << endl;
+ DEBUG_STREAM << "AlarmHandler::read_AlarmFormula(Tango::Attribute &attr) entering... " << endl;
Tango::DevString *att_value = get_AlarmFormula_data_ptr(attr.get_name());
- /*----- PROTECTED REGION ID(Alarm::read_AlarmFormula) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::read_AlarmFormula) ENABLED START -----*/
// Set the attribute value
attr.set_value(att_value);
- /*----- PROTECTED REGION END -----*/ // Alarm::read_AlarmFormula
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::read_AlarmFormula
}
//--------------------------------------------------------
/**
- * Method : Alarm::add_dynamic_attributes()
+ * Method : AlarmHandler::add_dynamic_attributes()
* Description : Create the dynamic attributes if any
* for specified device.
*/
//--------------------------------------------------------
-void Alarm::add_dynamic_attributes()
+void AlarmHandler::add_dynamic_attributes()
{
// Example to add dynamic attribute:
// Copy inside the following protected area to create instance(s) at startup.
// add_AlarmState_dynamic_attribute("MyAlarmStateAttribute");
// add_AlarmFormula_dynamic_attribute("MyAlarmFormulaAttribute");
- /*----- PROTECTED REGION ID(Alarm::add_dynamic_attributes) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::add_dynamic_attributes) ENABLED START -----*/
// Add your own code to create and add dynamic attributes if any
alarms.vlock->readerIn();
@@ -1355,7 +1341,7 @@ void Alarm::add_dynamic_attributes()
}
alarms.vlock->readerOut();
- /*----- PROTECTED REGION END -----*/ // Alarm::add_dynamic_attributes
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::add_dynamic_attributes
}
//--------------------------------------------------------
@@ -1366,10 +1352,10 @@ void Alarm::add_dynamic_attributes()
* @param argin String array containing the alarms to be acknowledged
*/
//--------------------------------------------------------
-void Alarm::ack(const Tango::DevVarStringArray *argin)
+void AlarmHandler::ack(const Tango::DevVarStringArray *argin)
{
- DEBUG_STREAM << "Alarm::Ack() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::ack) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Ack() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::ack) ENABLED START -----*/
// Add your own code
vector<string> str;
@@ -1443,7 +1429,7 @@ void Alarm::ack(const Tango::DevVarStringArray *argin)
}
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
}
found->ack = ACK;
@@ -1465,7 +1451,7 @@ void Alarm::ack(const Tango::DevVarStringArray *argin)
vector<alarm_t>::iterator found = \
find(alarmed.begin(), alarmed.end(), to_be_removed);
if (found != alarmed.end()) {
- DEBUG_STREAM << "Alarm::ack(): " << found->name \
+ DEBUG_STREAM << "AlarmHandler::ack(): " << found->name \
<< " S_NORMAL and ACK, removing" << endl;
alarmed.erase(found);
} else {
@@ -1517,7 +1503,7 @@ void Alarm::ack(const Tango::DevVarStringArray *argin)
INFO_STREAM << __func__<<": " << err.str() << endl;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::ack
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::ack
}
//--------------------------------------------------------
/**
@@ -1527,10 +1513,10 @@ void Alarm::ack(const Tango::DevVarStringArray *argin)
* @param argin Alarm entry
*/
//--------------------------------------------------------
-void Alarm::load(Tango::DevString argin)
+void AlarmHandler::load(Tango::DevString argin)
{
- DEBUG_STREAM << "Alarm::Load() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::load) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Load() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::load) ENABLED START -----*/
// Add your own code
string s;
@@ -1546,21 +1532,21 @@ void Alarm::load(Tango::DevString argin)
{
ostringstream err;
err << "error loading alarm=" << alm.name << " , " << e.errors[0].desc << ends;
- WARN_STREAM << "Alarm::load(): " << err.str() << endl;
+ WARN_STREAM << "AlarmHandler::load(): " << err.str() << endl;
Tango::Except::throw_exception( \
- (const char*)"Alarm::load()", \
+ (const char*)"AlarmHandler::load()", \
err.str(), \
- (const char*)"Alarm::load()", Tango::ERR);
+ (const char*)"AlarmHandler::load()", Tango::ERR);
}
try {
add_alarm(alm);
} catch (string& err) {
- WARN_STREAM << "Alarm::load(): " << err << endl;
+ WARN_STREAM << "AlarmHandler::load(): " << err << endl;
Tango::Except::throw_exception( \
- (const char*)"Alarm::load()", \
+ (const char*)"AlarmHandler::load()", \
(const char*)err.c_str(), \
- (const char*)"Alarm::load()", Tango::ERR);
+ (const char*)"AlarmHandler::load()", Tango::ERR);
}
#if 0
try
@@ -1571,7 +1557,7 @@ void Alarm::load(Tango::DevString argin)
catch(Tango::DevFailed &e)
{
ostringstream o;
- o << "Alarm::" << __func__<<": alarm '" << alm.name << "' cannot push att_conf event, err="<<e.errors[0].desc ;
+ o << "AlarmHandler::" << __func__<<": alarm '" << alm.name << "' cannot push att_conf event, err="<<e.errors[0].desc ;
INFO_STREAM << o.str() << endl;
}
#endif
@@ -1579,16 +1565,16 @@ void Alarm::load(Tango::DevString argin)
try {
add_event(alm, evn);
} catch (string& err) {
- WARN_STREAM << "Alarm::load(): " << err << endl;
+ WARN_STREAM << "AlarmHandler::load(): " << err << endl;
alarms.vlock->writerIn();
alarm_container_t::iterator i = alarms.v_alarm.find(alm.name); //look for alarm just added
if (i != alarms.v_alarm.end())
alarms.erase(i); //and remove from alarm_table
alarms.vlock->writerOut();
Tango::Except::throw_exception( \
- (const char*)"Alarm::load()", \
+ (const char*)"AlarmHandler::load()", \
(const char*)err.c_str(), \
- (const char*)"Alarm::load()", Tango::ERR);
+ (const char*)"AlarmHandler::load()", Tango::ERR);
}
#endif
alarms.save_alarm_conf_db(alm.attr_name, alm.name, "", "", alm.enabled, //add new alarm on log before subscribe event
@@ -1604,22 +1590,22 @@ void Alarm::load(Tango::DevString argin)
try {
add_event(i->second, evn);//moved after events->add
} catch (string& err) {
- WARN_STREAM << "Alarm::"<<__func__<<": string exception=" << err << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": string exception=" << err << endl;
//TODO: handle error
#if 0
for(vector<string>::iterator j = evn.begin(); j != evn.end(); j++)
{
- DEBUG_STREAM << "Alarm::"<<__func__<<": Removing alarm=" << i->second.name << " from event=" << *j << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": Removing alarm=" << i->second.name << " from event=" << *j << endl;
vector<event>::iterator k = \
find(events->v_event.begin(), events->v_event.end(), *j);
if (k != events->v_event.end())
{
k->pop_alarm(i->second.name); //remove alarm/formula just added to event
- DEBUG_STREAM << "Alarm::"<<__func__<<": Removed!!!! alarm=" << i->second.name << " from event=" << *j << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": Removed!!!! alarm=" << i->second.name << " from event=" << *j << endl;
if(k->m_alarm.empty())
{
events->v_event.erase(k); //remove event just added to event_table
- DEBUG_STREAM << "Alarm::"<<__func__<<": event=" << *j << " no more used, REMOVED!!!" << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": event=" << *j << " no more used, REMOVED!!!" << endl;
}
}
}
@@ -1627,7 +1613,7 @@ void Alarm::load(Tango::DevString argin)
#endif
}
catch (Tango::DevFailed &e) {
- WARN_STREAM << "Alarm::"<<__func__<<": Tango exception=" << e.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": Tango exception=" << e.errors[0].desc << endl;
}
@@ -1641,7 +1627,7 @@ void Alarm::load(Tango::DevString argin)
{
ostringstream err;
err << "Error: command " << i->second.cmd_name_a << " does not accept a Tango::DevString as input value" << ends;
- ERROR_STREAM << "Alarm::load(): " << err.str() << endl;
+ ERROR_STREAM << "AlarmHandler::load(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
}
else
@@ -1650,13 +1636,13 @@ void Alarm::load(Tango::DevString argin)
i->second.send_arg_a = true;
else
i->second.send_arg_a = false;
- DEBUG_STREAM << "Alarm::load(): successfully connected to proxy=" << i->second.cmd_dp_a << " for action=" << i->second.cmd_action_a << endl;
+ DEBUG_STREAM << "AlarmHandler::load(): successfully connected to proxy=" << i->second.cmd_dp_a << " for action=" << i->second.cmd_action_a << endl;
}
} catch(Tango::DevFailed& e)
{
ostringstream err;
err << alm.name << ": error connecting to device proxy=" << i->second.cmd_dp_a << ", err=" << e.errors[0].desc << ends;
- WARN_STREAM << "Alarm::load(): " << err.str() << endl;
+ WARN_STREAM << "AlarmHandler::load(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
}
}
@@ -1671,7 +1657,7 @@ void Alarm::load(Tango::DevString argin)
{
ostringstream err;
err << "Error: command " << i->second.cmd_name_n << " does not accept a Tango::DevString as input value" << ends;
- ERROR_STREAM << "Alarm::load(): " << err.str() << endl;
+ ERROR_STREAM << "AlarmHandler::load(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
}
else
@@ -1680,22 +1666,22 @@ void Alarm::load(Tango::DevString argin)
i->second.send_arg_n = true;
else
i->second.send_arg_n = false;
- DEBUG_STREAM << "Alarm::load(): successfully connected to proxy=" << i->second.cmd_dp_n << " for action=" << i->second.cmd_action_n << endl;
+ DEBUG_STREAM << "AlarmHandler::load(): successfully connected to proxy=" << i->second.cmd_dp_n << " for action=" << i->second.cmd_action_n << endl;
}
} catch(Tango::DevFailed& e)
{
ostringstream err;
err << alm.name << ": error connecting to device proxy=" << i->second.cmd_dp_n << ", err=" << e.errors[0].desc << ends;
- WARN_STREAM << "Alarm::load(): " << err.str() << endl;
+ WARN_STREAM << "AlarmHandler::load(): " << err.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), err.str());
}
}
- DEBUG_STREAM << "Alarm::"<<__func__<<": created command proxy, to_be_evaluated=" << (int)alm.to_be_evaluated << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": created command proxy, to_be_evaluated=" << (int)alm.to_be_evaluated << endl;
//TODO: to be moved in subscribe thread after subscription
//if at least one event was already existing, evaluate formula of just added alarm
if(i->second.to_be_evaluated) //TODO: remove this evaluation of the formula that is not necessary
{
- DEBUG_STREAM << "Alarm::"<<__func__<<": to_be_evaluated!!" << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": to_be_evaluated!!" << endl;
bei_t e;
e.ev_name = ALARM_THREAD_TO_BE_EVAL;
e.value.push_back(ALARM_THREAD_TO_BE_EVAL_VALUE);
@@ -1728,7 +1714,7 @@ void Alarm::load(Tango::DevString argin)
}
#endif
- /*----- PROTECTED REGION END -----*/ // Alarm::load
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::load
}
//--------------------------------------------------------
/**
@@ -1738,10 +1724,10 @@ void Alarm::load(Tango::DevString argin)
* @param argin Alarm name
*/
//--------------------------------------------------------
-void Alarm::remove(Tango::DevString argin)
+void AlarmHandler::remove(Tango::DevString argin)
{
- DEBUG_STREAM << "Alarm::Remove() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::remove) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Remove() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::remove) ENABLED START -----*/
// Add your own code
string s, log_alm_name;
@@ -1761,7 +1747,7 @@ void Alarm::remove(Tango::DevString argin)
Tango::Except::throw_exception( \
(const char*)"Error removing alarm", \
(const char*)err.str().c_str(), \
- (const char*)"Alarm::remove", Tango::ERR);
+ (const char*)"AlarmHandler::remove", Tango::ERR);
}
}
alarmedlock->readerOut();
@@ -1771,10 +1757,10 @@ void Alarm::remove(Tango::DevString argin)
Tango::Except::throw_exception( \
(const char*)"Error removing alarm", \
(const char*)err.c_str(), \
- (const char*)"Alarm::remove", Tango::ERR);
+ (const char*)"AlarmHandler::remove", Tango::ERR);
}
if (ret) {
- DEBUG_STREAM << "Alarm::remove(): removing alarm '" \
+ DEBUG_STREAM << "AlarmHandler::remove(): removing alarm '" \
<< s << "'" << endl;
while (true) {
string::size_type i = s.find_first_of("/.");
@@ -1833,7 +1819,7 @@ void Alarm::remove(Tango::DevString argin)
INFO_STREAM << __func__<<": " << err.str() << endl;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::remove
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::remove
}
//--------------------------------------------------------
/**
@@ -1844,11 +1830,11 @@ void Alarm::remove(Tango::DevString argin)
* @returns Configured alarms
*/
//--------------------------------------------------------
-Tango::DevVarStringArray *Alarm::search_alarm(Tango::DevString argin)
+Tango::DevVarStringArray *AlarmHandler::search_alarm(Tango::DevString argin)
{
Tango::DevVarStringArray *argout;
- DEBUG_STREAM << "Alarm::SearchAlarm() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::search_alarm) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::SearchAlarm() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::search_alarm) ENABLED START -----*/
// Add your own code
// POGO has generated a method core with argout allocation.
@@ -1859,7 +1845,7 @@ Tango::DevVarStringArray *Alarm::search_alarm(Tango::DevString argin)
argout = new Tango::DevVarStringArray();
//argout->length(1);
//(*argout)[0] = CORBA::string_dup("dummy");
- DEBUG_STREAM << "Alarm::configured(): entering... !" << endl;
+ DEBUG_STREAM << "AlarmHandler::configured(): entering... !" << endl;
// Add your own code to control device here
@@ -1925,7 +1911,7 @@ Tango::DevVarStringArray *Alarm::search_alarm(Tango::DevString argin)
i++;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::search_alarm
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::search_alarm
return argout;
}
//--------------------------------------------------------
@@ -1935,10 +1921,10 @@ Tango::DevVarStringArray *Alarm::search_alarm(Tango::DevString argin)
*
*/
//--------------------------------------------------------
-void Alarm::stop_audible()
+void AlarmHandler::stop_audible()
{
- DEBUG_STREAM << "Alarm::StopAudible() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::stop_audible) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::StopAudible() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::stop_audible) ENABLED START -----*/
// Add your own code
//12-06-08: StopNew command set is_new to 0
@@ -1992,7 +1978,7 @@ void Alarm::stop_audible()
INFO_STREAM << __func__<<": " << err.str() << endl;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::stop_audible
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::stop_audible
}
//--------------------------------------------------------
/**
@@ -2002,10 +1988,10 @@ void Alarm::stop_audible()
* @param argin String array containing the alarms to be silenced
*/
//--------------------------------------------------------
-void Alarm::silence(const Tango::DevVarStringArray *argin)
+void AlarmHandler::silence(const Tango::DevVarStringArray *argin)
{
- DEBUG_STREAM << "Alarm::Silence() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::silence) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Silence() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::silence) ENABLED START -----*/
// Add your own code
vector<string> str;
@@ -2044,7 +2030,7 @@ void Alarm::silence(const Tango::DevVarStringArray *argin)
Tango::Except::throw_exception( \
(const char*)"Alarm already silenced", \
err.str(), \
- (const char*)"Alarm::silence()", Tango::ERR);
+ (const char*)"AlarmHandler::silence()", Tango::ERR);
}
if(i->second.silent_time <= 0)
{
@@ -2054,7 +2040,7 @@ void Alarm::silence(const Tango::DevVarStringArray *argin)
Tango::Except::throw_exception( \
(const char*)"Alarm cannot be silenced", \
err.str(), \
- (const char*)"Alarm::silence()", Tango::ERR);
+ (const char*)"AlarmHandler::silence()", Tango::ERR);
}
//load silent time
@@ -2081,7 +2067,7 @@ void Alarm::silence(const Tango::DevVarStringArray *argin)
Tango::Except::throw_exception( \
(const char*)"Alarm not found!!", \
err.str(), \
- (const char*)"Alarm::silence()", Tango::ERR);
+ (const char*)"AlarmHandler::silence()", Tango::ERR);
}
alarms.vlock->readerOut();
}
@@ -2128,7 +2114,7 @@ void Alarm::silence(const Tango::DevVarStringArray *argin)
INFO_STREAM << __func__<<": " << err.str() << endl;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::silence
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::silence
}
//--------------------------------------------------------
/**
@@ -2138,11 +2124,13 @@ void Alarm::silence(const Tango::DevVarStringArray *argin)
* @param argin Alarm entry
*/
//--------------------------------------------------------
-void Alarm::modify(Tango::DevString argin)
+void AlarmHandler::modify(Tango::DevString argin)
{
- DEBUG_STREAM << "Alarm::Modify() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::modify) ENABLED START -----*/
- DEBUG_STREAM << "Alarm::Modify: " << argin << endl;
+ DEBUG_STREAM << "AlarmHandler::Modify() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::modify) ENABLED START -----*/
+
+ // Add your own code
+ DEBUG_STREAM << "AlarmHandler::Modify: " << argin << endl;
// Add your own code
//------------------------------
//1: parse to get alarm name
@@ -2228,7 +2216,7 @@ void Alarm::modify(Tango::DevString argin)
(const char*)__func__, Tango::ERR);
}
- DEBUG_STREAM << "Alarm::Modify: parsing ended: alm name=" << alm.name << endl;
+ DEBUG_STREAM << "AlarmHandler::Modify: parsing ended: alm name=" << alm.name << endl;
//------------------------------
//2: if alarm already exist and
// formula is not changed
@@ -2369,7 +2357,7 @@ void Alarm::modify(Tango::DevString argin)
//3: remove (set active=0 on db)
//------------------------------
remove((Tango::DevString)alm.name.c_str());
- DEBUG_STREAM << "Alarm::Modify: removed alm name=" << alm.name << endl;
+ DEBUG_STREAM << "AlarmHandler::Modify: removed alm name=" << alm.name << endl;
//------------------------------
//4: load modified alarm
//------------------------------
@@ -2417,7 +2405,7 @@ void Alarm::modify(Tango::DevString argin)
INFO_STREAM << __func__<<": " << err.str() << endl;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::modify
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::modify
}
//--------------------------------------------------------
/**
@@ -2427,10 +2415,10 @@ void Alarm::modify(Tango::DevString argin)
* @param argin String array containing alarm to be shelved
*/
//--------------------------------------------------------
-void Alarm::shelve(const Tango::DevVarStringArray *argin)
+void AlarmHandler::shelve(const Tango::DevVarStringArray *argin)
{
- DEBUG_STREAM << "Alarm::Shelve() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::shelve) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Shelve() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::shelve) ENABLED START -----*/
// Add your own code
vector<string> str;
@@ -2550,7 +2538,7 @@ void Alarm::shelve(const Tango::DevVarStringArray *argin)
}
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
alarms.vlock->readerOut();
}
@@ -2593,7 +2581,7 @@ void Alarm::shelve(const Tango::DevVarStringArray *argin)
INFO_STREAM << __func__<<": " << err.str() << endl;
}
- /*----- PROTECTED REGION END -----*/ // Alarm::shelve
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::shelve
}
//--------------------------------------------------------
/**
@@ -2603,10 +2591,10 @@ void Alarm::shelve(const Tango::DevVarStringArray *argin)
* @param argin Alarm name
*/
//--------------------------------------------------------
-void Alarm::enable(Tango::DevString argin)
+void AlarmHandler::enable(Tango::DevString argin)
{
- DEBUG_STREAM << "Alarm::Enable() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::enable) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Enable() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::enable) ENABLED START -----*/
// Add your own code
string arginname(argin);
@@ -2662,7 +2650,7 @@ void Alarm::enable(Tango::DevString argin)
}
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
alarms.vlock->readerOut();
@@ -2706,7 +2694,7 @@ void Alarm::enable(Tango::DevString argin)
}
//update attribute properties
events->update_property();
- /*----- PROTECTED REGION END -----*/ // Alarm::enable
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::enable
}
//--------------------------------------------------------
/**
@@ -2716,10 +2704,10 @@ void Alarm::enable(Tango::DevString argin)
* @param argin Alarm name
*/
//--------------------------------------------------------
-void Alarm::disable(Tango::DevString argin)
+void AlarmHandler::disable(Tango::DevString argin)
{
- DEBUG_STREAM << "Alarm::Disable() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::disable) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::Disable() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::disable) ENABLED START -----*/
// Add your own code
string arginname(argin);
@@ -2768,7 +2756,7 @@ void Alarm::disable(Tango::DevString argin)
}
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
alarms.vlock->readerOut();
@@ -2782,7 +2770,7 @@ void Alarm::disable(Tango::DevString argin)
vector<alarm_t>::iterator found = \
find(alarmed.begin(), alarmed.end(), arginname);
if (found != alarmed.end()) {
- DEBUG_STREAM << "Alarm::"<<__func__<<": " << found->name \
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": " << found->name \
<< " removing" << endl;
alarmed.erase(found);
} else {
@@ -2834,7 +2822,7 @@ void Alarm::disable(Tango::DevString argin)
}
//update attribute properties
events->update_property();
- /*----- PROTECTED REGION END -----*/ // Alarm::disable
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::disable
}
//--------------------------------------------------------
/**
@@ -2843,10 +2831,10 @@ void Alarm::disable(Tango::DevString argin)
*
*/
//--------------------------------------------------------
-void Alarm::reset_statistics()
+void AlarmHandler::reset_statistics()
{
- DEBUG_STREAM << "Alarm::ResetStatistics() - " << device_name << endl;
- /*----- PROTECTED REGION ID(Alarm::reset_statistics) ENABLED START -----*/
+ DEBUG_STREAM << "AlarmHandler::ResetStatistics() - " << device_name << endl;
+ /*----- PROTECTED REGION ID(AlarmHandler::reset_statistics) ENABLED START -----*/
// Add your own code
alarms.vlock->readerIn();
@@ -2859,33 +2847,33 @@ void Alarm::reset_statistics()
double dnow = (now.tv_sec) + ((double)(now.tv_nsec))/1000000000;
last_statistics_reset_time = dnow;
alarms.vlock->readerOut();
- /*----- PROTECTED REGION END -----*/ // Alarm::reset_statistics
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::reset_statistics
}
//--------------------------------------------------------
/**
- * Method : Alarm::add_dynamic_commands()
+ * Method : AlarmHandler::add_dynamic_commands()
* Description : Create the dynamic commands if any
* for specified device.
*/
//--------------------------------------------------------
-void Alarm::add_dynamic_commands()
+void AlarmHandler::add_dynamic_commands()
{
- /*----- PROTECTED REGION ID(Alarm::add_dynamic_commands) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::add_dynamic_commands) ENABLED START -----*/
// Add your own code to create and add dynamic commands if any
- /*----- PROTECTED REGION END -----*/ // Alarm::add_dynamic_commands
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::add_dynamic_commands
}
-/*----- PROTECTED REGION ID(Alarm::namespace_ending) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::namespace_ending) ENABLED START -----*/
// Additional Methods
/*
* private methods
*/
-void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
+void AlarmHandler::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
{
- DEBUG_STREAM << "Alarm::load_alarm(): Creating Spirit Parser..." << endl;
+ DEBUG_STREAM << "AlarmHandler::load_alarm(): Creating Spirit Parser..." << endl;
alarm_parse al_gr(alm); // Construct Spirit grammar
alm.name.clear();
alm.attr_name.clear();
@@ -2982,15 +2970,15 @@ void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
else
{
ostringstream o;
- o << "Alarm::load_alarm(): Parsing Failed, '" << string(alarm_string.begin(), alm.formula_tree.stop) << "' parsed ok, BUT '" << string(alm.formula_tree.stop, alarm_string.end()) << "' not parsed" << ends; //TODO
+ o << "AlarmHandler::load_alarm(): Parsing Failed, '" << string(alarm_string.begin(), alm.formula_tree.stop) << "' parsed ok, BUT '" << string(alm.formula_tree.stop, alarm_string.end()) << "' not parsed" << ends; //TODO
DEBUG_STREAM << o.str() << endl;
Tango::Except::throw_exception( \
(const char*)"Parsing Failed!", \
(const char*)o.str().c_str(), \
- (const char*)"Alarm::load_alarm()", Tango::ERR);
+ (const char*)"AlarmHandler::load_alarm()", Tango::ERR);
}
alm.ts = gettime();
- DEBUG_STREAM << "Alarm::load_alarm(): name = '" << alm.name << "'" << endl;
+ DEBUG_STREAM << "AlarmHandler::load_alarm(): name = '" << alm.name << "'" << endl;
DEBUG_STREAM << " attr_name = '" << alm.attr_name << "'" << endl;
DEBUG_STREAM << " formula = '" << alm.formula << "'" << endl;
DEBUG_STREAM << " on_delay = '" << alm.on_delay << "'" << endl;
@@ -3014,26 +3002,26 @@ void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
// alm.lev = LEV_DEFAULT;
} else {
ostringstream o;
- o << "Alarm::load_alarm(): syntax error in '" << alarm_string << "'" << ends;
+ o << "AlarmHandler::load_alarm(): syntax error in '" << alarm_string << "'" << ends;
WARN_STREAM << o.str() << endl;
Tango::Except::throw_exception( \
(const char*)o.str().c_str(), \
(const char*)"", \
- (const char*)"Alarm::load_alarm()", Tango::ERR);
+ (const char*)"AlarmHandler::load_alarm()", Tango::ERR);
}
if (alarms.exist(alm.name)) {
ostringstream o;
- o << "Alarm::load_alarm(): alarm '" << alm.name << "' already exist" << ends;
+ o << "AlarmHandler::load_alarm(): alarm '" << alm.name << "' already exist" << ends;
WARN_STREAM << o.str() << endl;
Tango::Except::throw_exception( \
(const char*)o.str().c_str(), \
(const char*)o.str().c_str(), \
- (const char*)"Alarm::load_alarm()", Tango::ERR);
+ (const char*)"AlarmHandler::load_alarm()", Tango::ERR);
}
}
#if 0
-void Alarm::init_alarms(map< string,vector<string> > &alarm_events)
+void AlarmHandler::init_alarms(map< string,vector<string> > &alarm_events)
{
alarms.vlock->readerIn();
if (alarms.v_alarm.empty() == false)
@@ -3046,18 +3034,18 @@ void Alarm::init_alarms(map< string,vector<string> > &alarm_events)
alarm_events.find(i->second.name);
if(f == alarm_events.end())
continue; //ERROR: alarm not found in alarm_event map
- DEBUG_STREAM << "Alarm::init_alarms(): found Alarm= " << i->second.name << endl;
+ DEBUG_STREAM << "AlarmHandler::init_alarms(): found Alarm= " << i->second.name << endl;
for(vector<string>::iterator j = f->second.begin(); \
j != f->second.end(); j++)
{
vector<event>::iterator found = \
find(events->v_event.begin(), events->v_event.end(), (*j));
- DEBUG_STREAM << "Alarm::init_alarms(): looking in events table for Event= " << (*j) << endl;
+ DEBUG_STREAM << "AlarmHandler::init_alarms(): looking in events table for Event= " << (*j) << endl;
if (found != events->v_event.end())
{
i->second.insert(found->name);
found->push_alarm(i->second.name);
- DEBUG_STREAM << "Alarm::init_alarms(): found Event= " << found->name << " <- Alarm= " << i->second.name << endl;
+ DEBUG_STREAM << "AlarmHandler::init_alarms(): found Event= " << found->name << " <- Alarm= " << i->second.name << endl;
//break; ???
} /* if */
} /* for */
@@ -3066,7 +3054,7 @@ void Alarm::init_alarms(map< string,vector<string> > &alarm_events)
alarms.vlock->readerOut();
}
#endif
-void Alarm::init_events(vector<string> &evn)
+void AlarmHandler::init_events(vector<string> &evn)
{
if (evn.empty() == false) {
sort(evn.begin(), evn.end());
@@ -3082,10 +3070,10 @@ void Alarm::init_events(vector<string> &evn)
}
} /* if */
}
-void Alarm::add_alarm(alarm_t& a) throw(string&)
+void AlarmHandler::add_alarm(alarm_t& a) throw(string&)
{
alarms.push_back(a);
- DEBUG_STREAM << "Alarm::add_alarm(): added alarm '" \
+ DEBUG_STREAM << "AlarmHandler::add_alarm(): added alarm '" \
<< a.name << "'" << endl;
alarm_container_t::iterator italm = alarms.v_alarm.find(a.name);
@@ -3100,9 +3088,9 @@ void Alarm::add_alarm(alarm_t& a) throw(string&)
italm->second.attr_value_formula = attr_value_formula;
}
-void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
+void AlarmHandler::add_event(alarm_t& a, vector<string> &evn) throw(string&)
{
- DEBUG_STREAM << "Alarm::add_event(): formula '" << a.formula << "' found " << evn.size() << " events" << endl;
+ DEBUG_STREAM << "AlarmHandler::add_event(): formula '" << a.formula << "' found " << evn.size() << " events" << endl;
/*
* get the list of all the events in the formula
*/
@@ -3130,7 +3118,7 @@ void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
*/
k->push_alarm(a.name);
a.to_be_evaluated = true;
- DEBUG_STREAM << "Alarm::add_event(): '" << *j << "' found, added " \
+ DEBUG_STREAM << "AlarmHandler::add_event(): '" << *j << "' found, added " \
<< " alarm '" << a.name << "' to list, valid=" << k->valid << endl;
alarms.vlock->readerIn();
alarm_container_t::iterator l = alarms.v_alarm.find(a.name);
@@ -3140,7 +3128,7 @@ void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
}
else
{
- WARN_STREAM << "Alarm::add_event(): error inserting event '" << *j << "' in set of alarm '"
+ WARN_STREAM << "AlarmHandler::add_event(): error inserting event '" << *j << "' in set of alarm '"
<< a.name << "'" << endl;
}
alarms.vlock->readerOut();
@@ -3155,7 +3143,7 @@ void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
/*
* update per-alarm event list
*/
- DEBUG_STREAM << "Alarm::add_event(): adding '" << *j \
+ DEBUG_STREAM << "AlarmHandler::add_event(): adding '" << *j \
<< "' to event list of alarm '" << a.name << "'" << endl;
alarms.vlock->readerIn();
alarm_container_t::iterator l = alarms.v_alarm.find(a.name);
@@ -3165,7 +3153,7 @@ void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
}
else
{
- WARN_STREAM << "Alarm::add_event(): error inserting event '" << *j << "' in set of alarm '"
+ WARN_STREAM << "AlarmHandler::add_event(): error inserting event '" << *j << "' in set of alarm '"
<< a.name << "'" << endl;
}
alarms.vlock->readerOut();
@@ -3184,7 +3172,7 @@ void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
ecb.extract_values(&attr_value, k->value, k->type);
k->valid = true;
ostringstream msg;
- msg << "Alarm::add_event(): initial values of " << k->name << " = ";
+ msg << "AlarmHandler::add_event(): initial values of " << k->name << " = ";
for(vector<double>::iterator dd=k->value.begin(); dd!=k->value.end(); dd++)
msg << (*dd) << " ";
msg << ", valid=" << k->valid << ends;
@@ -3233,7 +3221,7 @@ void Alarm::add_event(alarm_t& a, vector<string> &evn) throw(string&)
* because called asynchronously by alarm evaluating thread
* will use an alarm to report errors
*/
-void Alarm::do_alarm(bei_t& e)
+void AlarmHandler::do_alarm(bei_t& e)
{
bool changed=true;
int num_changed=0;
@@ -3242,7 +3230,7 @@ void Alarm::do_alarm(bei_t& e)
{
ostringstream o;
o << e.msg << endl;
- WARN_STREAM << "Alarm::"<<__func__<<": " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": " << o.str() << endl;
vector<event>::iterator found_ev = \
find(events->v_event.begin(), events->v_event.end(), e.ev_name);
if (found_ev == events->v_event.end())
@@ -3259,14 +3247,14 @@ void Alarm::do_alarm(bei_t& e)
if(pos_dot < pos_slash && pos_dot != string::npos && pos_colon != string::npos && pos_slash != string::npos) //dot is in the TANGO_HOST part
{
string ev_name_str_no_domain = ev_name_str.substr(0,pos_dot) + ev_name_str.substr(pos_colon);
- //DEBUG_STREAM << "Alarm::"<<__func__<<": event "<< e.ev_name << " not found, trying without domain: " << ev_name_str_no_domain;
+ //DEBUG_STREAM << "AlarmHandler::"<<__func__<<": event "<< e.ev_name << " not found, trying without domain: " << ev_name_str_no_domain;
found_ev = \
find(events->v_event.begin(), events->v_event.end(), ev_name_str_no_domain);
}
if (found_ev == events->v_event.end() && pos_slash != string::npos)
{
ev_name_str = ev_name_str.substr(pos_slash + 1);//remove FQDN
- //DEBUG_STREAM << "Alarm::"<<__func__<<": event "<< e.ev_name << " not found, trying without fqdn: " << ev_name_str;
+ //DEBUG_STREAM << "AlarmHandler::"<<__func__<<": event "<< e.ev_name << " not found, trying without fqdn: " << ev_name_str;
found_ev = \
find(events->v_event.begin(), events->v_event.end(), ev_name_str);
}
@@ -3280,7 +3268,7 @@ void Alarm::do_alarm(bei_t& e)
ostringstream o;
o << "TANGO Error but event '" \
<< e.ev_name << "' not found in event table!" << ends;
- WARN_STREAM << "Alarm::"<<__func__<<": " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": " << o.str() << endl;
set_internal_alarm(e.ev_name, gettime(), o.str());
}
}
@@ -3316,7 +3304,7 @@ void Alarm::do_alarm(bei_t& e)
errors[0].reason = CORBA::string_dup(it->second.ex_reason.c_str());
errors[0].origin = CORBA::string_dup(it->second.ex_origin.c_str());
Tango::DevFailed except(errors);
- DEBUG_STREAM << "Alarm::"<<__func__<<": PUSHING EXCEPTION FOR " << it->second.attr_name << " " << it->second.ex_desc << "-" << it->second.ex_reason << "-" << it->second.ex_origin << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": PUSHING EXCEPTION FOR " << it->second.attr_name << " " << it->second.ex_desc << "-" << it->second.ex_reason << "-" << it->second.ex_origin << endl;
push_change_event(it->second.attr_name, &except);
push_archive_event(it->second.attr_name, &except);
}catch(Tango::DevFailed &ex)
@@ -3328,7 +3316,7 @@ void Alarm::do_alarm(bei_t& e)
}
return;
}
- DEBUG_STREAM << "Alarm::"<<__func__<<": arrived event=" << e.ev_name << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": arrived event=" << e.ev_name << endl;
formula_res_t res;
vector<event>::iterator found = \
@@ -3347,14 +3335,14 @@ void Alarm::do_alarm(bei_t& e)
if(pos_dot < pos_slash && pos_dot != string::npos && pos_colon != string::npos && pos_slash != string::npos) //dot is in the TANGO_HOST part
{
string ev_name_str_no_domain = ev_name_str.substr(0,pos_dot) + ev_name_str.substr(pos_colon);
- //DEBUG_STREAM << "Alarm::"<<__func__<<": event "<< e.ev_name << " not found, trying without domain: " << ev_name_str_no_domain;
+ //DEBUG_STREAM << "AlarmHandler::"<<__func__<<": event "<< e.ev_name << " not found, trying without domain: " << ev_name_str_no_domain;
found = \
find(events->v_event.begin(), events->v_event.end(), ev_name_str_no_domain);
}
if (found == events->v_event.end() && pos_slash != string::npos)
{
ev_name_str = ev_name_str.substr(pos_slash + 1);//remove FQDN
- //DEBUG_STREAM << "Alarm::"<<__func__<<": event "<< e.ev_name << " not found, trying without fqdn: " << ev_name_str;
+ //DEBUG_STREAM << "AlarmHandler::"<<__func__<<": event "<< e.ev_name << " not found, trying without fqdn: " << ev_name_str;
found = \
find(events->v_event.begin(), events->v_event.end(), ev_name_str);
}
@@ -3368,7 +3356,7 @@ void Alarm::do_alarm(bei_t& e)
ostringstream o;
o << "event '" \
<< e.ev_name << "' not found in event table!" << ends;
- WARN_STREAM << "Alarm::"<<__func__<<": " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": " << o.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), o.str());
}
}
@@ -3388,7 +3376,7 @@ void Alarm::do_alarm(bei_t& e)
vector<string>::iterator j = found->m_alarm.begin();
while (j != found->m_alarm.end())
{
- DEBUG_STREAM << "Alarm::"<<__func__<<": before do_alarm_eval name=" << *j << " ev=" << e.ev_name << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": before do_alarm_eval name=" << *j << " ev=" << e.ev_name << endl;
changed = do_alarm_eval(*j, e.ev_name, found->ts);
if(changed)
num_changed++;
@@ -3433,19 +3421,19 @@ void Alarm::do_alarm(bei_t& e)
}
else
{
- DEBUG_STREAM << "Alarm::"<<__func__<<": event=" << e.ev_name << "NOT FOUND IN EVENT TABLE" << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": event=" << e.ev_name << "NOT FOUND IN EVENT TABLE" << endl;
}
} /* do_alarm() */
-bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
+bool AlarmHandler::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
{
bool changed = true;
bool eval_err = false;
formula_res_t res;
//alarm_container_t::iterator it = alarms.v_alarm.find(j->first);
- DEBUG_STREAM << "Alarm::"<<__func__<<": before lock name=" << alm_name<< " ev=" << ev_name << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": before lock name=" << alm_name<< " ev=" << ev_name << endl;
alarms.vlock->readerIn();
- DEBUG_STREAM << "Alarm::"<<__func__<<": after lock name=" << alm_name<< " ev=" << ev_name << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": after lock name=" << alm_name<< " ev=" << ev_name << endl;
alarm_container_t::iterator it = alarms.v_alarm.find(alm_name);
if(it != alarms.v_alarm.end())
{
@@ -3454,7 +3442,7 @@ bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
try {
string attr_values;
res = eval_formula(it->second.formula_tree, attr_values);
- DEBUG_STREAM << "Alarm::"<<__func__<<": Evaluation of " << it->second.formula << "; result=" << res.value << " quality=" << res.quality << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": Evaluation of " << it->second.formula << "; result=" << res.value << " quality=" << res.quality << endl;
changed = alarms.update(tmpname, ts, res, attr_values, it->second.grp2str(), it->second.msg, it->second.formula); //update internal structure and log to db
Tango::DevEnum *attr_value = get_AlarmState_data_ptr(it->second.attr_name);
if(!it->second.enabled)
@@ -3492,14 +3480,14 @@ bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
}
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
} catch(std::out_of_range& ex)
{
eval_err = true;
ostringstream o;
o << tmpname << ": in formula array index out of range!" << ends;
- WARN_STREAM << "Alarm::"<<__func__<<": " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": " << o.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), o.str());
try
{ //DevFailed for push events
@@ -3517,14 +3505,14 @@ bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
push_archive_event(it->second.attr_name, &except);
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
} catch(string & ex)
{
eval_err = true;
ostringstream o;
o << tmpname << ": in formula err=" << ex << ends;
- WARN_STREAM << "Alarm::"<<__func__<<": " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": " << o.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), o.str());
try
{ //DevFailed for push events
@@ -3542,7 +3530,7 @@ bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
push_archive_event(it->second.attr_name, &except);
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
}
if(!eval_err)
@@ -3553,7 +3541,7 @@ bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
ostringstream o;
//o << j->first << ": not found formula in alarm table" << ends;
o << (alm_name) << ": not found formula in alarm table" << ends;
- WARN_STREAM << "Alarm::"<<__func__<<": " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": " << o.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), o.str());
try
{ //DevFailed for push events
@@ -3571,30 +3559,30 @@ bool Alarm::do_alarm_eval(string alm_name, string ev_name, Tango::TimeVal ts)
push_archive_event(it->second.attr_name, &except);
} catch(Tango::DevFailed & ex)
{
- WARN_STREAM << "Alarm::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": EXCEPTION PUSHING EVENTS: " << ex.errors[0].desc << endl;
}
}
alarms.vlock->readerOut();
return changed;
}
-void Alarm::timer_update()
+void AlarmHandler::timer_update()
{
bool changed=true;
- //DEBUG_STREAM << "Alarm::timer_update(): entering..." << endl;
+ //DEBUG_STREAM << "AlarmHandler::timer_update(): entering..." << endl;
try {
changed=alarms.timer_update();
} catch(string & e)
{
ostringstream o;
o << "Error checking time thresholds and updating alarm status=" << e << ends;
- WARN_STREAM << "Alarm::timer_update(): " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::timer_update(): " << o.str() << endl;
set_internal_alarm(INTERNAL_ERROR, gettime(), o.str());
/* Tango::DevErrorList errors(1);
errors.length(1);
it->second.ex_reason = string("INTERNAL_ERROR");
it->second.ex_desc = o.str();
- it->second.ex_origin = string("Alarm::timer_update");
+ it->second.ex_origin = string("AlarmHandler::timer_update");
errors[0].desc = CORBA::string_dup(it->second.ex_desc.c_str());
errors[0].severity = Tango::ERR;
errors[0].reason = CORBA::string_dup(it->second.ex_reason.c_str());
@@ -3649,16 +3637,16 @@ void Alarm::timer_update()
}
}
-bool Alarm::remove_alarm(string& s) throw(string&)
+bool AlarmHandler::remove_alarm(string& s) throw(string&)
{
- DEBUG_STREAM << "Alarm::"<<__func__<<": entering alm name=" << s << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": entering alm name=" << s << endl;
alarms.vlock->writerIn();
alarm_container_t::iterator i = alarms.v_alarm.find(s);
if (i != alarms.v_alarm.end()) {
- DEBUG_STREAM << "Alarm::"<<__func__<<": found in table alm name=" << s << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": found in table alm name=" << s << endl;
for (set<string>::iterator j = i->second.s_event.begin(); \
j != i->second.s_event.end(); j++) {
- DEBUG_STREAM << "Alarm::"<<__func__<<": looping event =" << *j << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": looping event =" << *j << endl;
/*
* for each event into the per-alarm event list find
* the event table entry and remove this alarm from
@@ -3667,18 +3655,18 @@ bool Alarm::remove_alarm(string& s) throw(string&)
vector<event>::iterator k = \
find(events->v_event.begin(), events->v_event.end(), *j);
if (k != events->v_event.end()) {
- DEBUG_STREAM << "Alarm::"<<__func__<<": found event =" << *j << " in vector events, removing from its alarm list name=" << i->second.name << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": found event =" << *j << " in vector events, removing from its alarm list name=" << i->second.name << endl;
/*
* remove alarm
*/
k->pop_alarm(i->second.name);
- DEBUG_STREAM << "Alarm::"<<__func__<<": after pop_alarm" << endl;
+ DEBUG_STREAM << "AlarmHandler::"<<__func__<<": after pop_alarm" << endl;
if (k->m_alarm.empty()) {
/*
* no more alarms associated to this event, unsubscribe
* and remove from event table
*/
- DEBUG_STREAM << "Alarm::remove_alarm(): removing event '" \
+ DEBUG_STREAM << "AlarmHandler::remove_alarm(): removing event '" \
<< k->name << "' from event table" << endl;
try {
events->stop(k->name);
@@ -3687,7 +3675,7 @@ bool Alarm::remove_alarm(string& s) throw(string&)
ostringstream o;
o << "unsubscribe_event() failed for " \
<< k->name << ends;
- WARN_STREAM << "Alarm::remove_alarm(): " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::remove_alarm(): " << o.str() << endl;
alarms.vlock->writerOut();
throw o.str();
//return false;
@@ -3701,7 +3689,7 @@ bool Alarm::remove_alarm(string& s) throw(string&)
ostringstream o;
o << "event '" << *j \
<< "' not found in event table" << ends;
- WARN_STREAM << "Alarm::remove_alarm(): " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::remove_alarm(): " << o.str() << endl;
alarms.vlock->writerOut();
throw o.str();
//return false;
@@ -3722,7 +3710,7 @@ bool Alarm::remove_alarm(string& s) throw(string&)
catch(Tango::DevFailed &e)
{
ostringstream o;
- o << "Alarm::" << __func__<<": attname '" << i->second.attr_name << "' exception removing attribute err="<<e.errors[0].desc ;
+ o << "AlarmHandler::" << __func__<<": attname '" << i->second.attr_name << "' exception removing attribute err="<<e.errors[0].desc ;
INFO_STREAM << o.str() << endl;
}
try
@@ -3732,7 +3720,7 @@ bool Alarm::remove_alarm(string& s) throw(string&)
catch(Tango::DevFailed &e)
{
ostringstream o;
- o << "Alarm::" << __func__<<": attname '" << i->second.attr_name_formula << "' exception removing attribute err="<<e.errors[0].desc ;
+ o << "AlarmHandler::" << __func__<<": attname '" << i->second.attr_name_formula << "' exception removing attribute err="<<e.errors[0].desc ;
INFO_STREAM << o.str() << endl;
}
/*
@@ -3744,19 +3732,19 @@ bool Alarm::remove_alarm(string& s) throw(string&)
}
else
{
- WARN_STREAM << "Alarm::"<<__func__<<": NOT found in table alm name=" << s << endl;
+ WARN_STREAM << "AlarmHandler::"<<__func__<<": NOT found in table alm name=" << s << endl;
}
alarms.vlock->writerOut();
ostringstream o;
o << "alarm '" \
<< s << "' not found in alarm table" << ends;
- WARN_STREAM << "Alarm::remove_alarm(): " << o.str() << endl;
+ WARN_STREAM << "AlarmHandler::remove_alarm(): " << o.str() << endl;
throw o.str();
//return false;
} /* remove_alarm() */
-/*void Alarm::add_to_database(alarm_t& a) throw(string&)
+/*void AlarmHandler::add_to_database(alarm_t& a) throw(string&)
{
Tango::DbDatum alarm("alarm");
Tango::DbData db_data;
@@ -3777,23 +3765,23 @@ bool Alarm::remove_alarm(string& s) throw(string&)
num << a.grp << ends;
// sprintf(buf, "%02X-", buf2[j]);//change here the format of saved data
// string pro = a.name+"\t"+"$"+a.formula+"$"+"\t"+"\""+a.msg+"\""+"\t"+num.str();
- //DEBUG_STREAM << "Alarm::add_to_database(): a.name=" << a.name << " a.formula=" << a.formula << " a.lev=" << a.lev << " a.grp=" << a.grp2str() << " a.msg=" << a.msg << endl;
+ //DEBUG_STREAM << "AlarmHandler::add_to_database(): a.name=" << a.name << " a.formula=" << a.formula << " a.lev=" << a.lev << " a.grp=" << a.grp2str() << " a.msg=" << a.msg << endl;
string pro = a.name+"\t"+a.formula+"\t"+string(a.time_threshold)+"\t"+ a.lev+"\t"+a.grp2str()+"\t"+"\""+a.msg+"\""+"\t"+a.cmd_name+"\t"; //grp has been transformed to string
- DEBUG_STREAM << "Alarm::add_to_database(): adding to database property=" << pro << endl;
+ DEBUG_STREAM << "AlarmHandler::add_to_database(): adding to database property=" << pro << endl;
property << pro;
db_data.push_back(property);
try {
get_db_device()->put_attribute_property(db_data);
} catch (...) {
ostringstream o;
- o << "Alarm::add_to_database(): put_device_attribute_property()" \
+ o << "AlarmHandler::add_to_database(): put_device_attribute_property()" \
<< " failed" << ends;
ERROR_STREAM << o.str() << endl;
throw o.str();
}
}*/
-void Alarm::set_internal_alarm(string name, Tango::TimeVal t, string msg, unsigned int count)
+void AlarmHandler::set_internal_alarm(string name, Tango::TimeVal t, string msg, unsigned int count)
{
alarm_t alm;
bool existing=false;
@@ -3877,12 +3865,12 @@ void Alarm::set_internal_alarm(string name, Tango::TimeVal t, string msg, unsign
//==============================================================
//------------------- AST evaluation methods -------------------
//==============================================================
-formula_res_t Alarm::eval_formula(tree_parse_info_t tree, string &attr_values)
+formula_res_t AlarmHandler::eval_formula(tree_parse_info_t tree, string &attr_values)
{
return eval_expression(tree.trees.begin(), attr_values);
}
-formula_res_t Alarm::eval_expression(iter_t const& i, string &attr_values, int ev_ind) //throw (string &), std::out_of_range
+formula_res_t AlarmHandler::eval_expression(iter_t const& i, string &attr_values, int ev_ind) //throw (string &), std::out_of_range
{
ostringstream err;
@@ -4500,13 +4488,13 @@ formula_res_t Alarm::eval_expression(iter_t const& i, string &attr_values, int e
return res;
}
-void Alarm::find_event_formula(tree_parse_info_t tree, vector<string> & ev)
+void AlarmHandler::find_event_formula(tree_parse_info_t tree, vector<string> & ev)
{
eval_node_event(tree.trees.begin(), ev);
return;
}
-void Alarm::eval_node_event(iter_t const& i, vector<string> & ev)
+void AlarmHandler::eval_node_event(iter_t const& i, vector<string> & ev)
{
DEBUG_STREAM << "In eval_node_event. i->value = '" <<
string(i->value.begin(), i->value.end()) <<
@@ -4537,7 +4525,7 @@ void Alarm::eval_node_event(iter_t const& i, vector<string> & ev)
}
-void Alarm::prepare_alarm_attr()
+void AlarmHandler::prepare_alarm_attr()
{
alarm_container_t::iterator ai;
vector<alarm_t>::iterator aid;
@@ -4778,7 +4766,7 @@ void Alarm::prepare_alarm_attr()
}
//=============================================================================
-string Alarm::remove_domain(string str)
+string AlarmHandler::remove_domain(string str)
{
string::size_type end1 = str.find(".");
if (end1 == string::npos)
@@ -4806,7 +4794,7 @@ string Alarm::remove_domain(string str)
}
//=============================================================================
//=============================================================================
-bool Alarm::compare_without_domain(string str1, string str2)
+bool AlarmHandler::compare_without_domain(string str1, string str2)
{
string str1_nd = remove_domain(str1);
string str2_nd = remove_domain(str2);
@@ -4815,7 +4803,7 @@ bool Alarm::compare_without_domain(string str1, string str2)
//=============================================================================
//=============================================================================
-void Alarm::put_signal_property()
+void AlarmHandler::put_signal_property()
{
vector<string> prop;
alarms.vlock->readerIn();
@@ -4903,7 +4891,7 @@ void Alarm::put_signal_property()
* parameter attname: attribute name to be removed.
*/
//--------------------------------------------------------
-void Alarm::remove_AlarmState_dynamic_attribute_no_clean_db(string attname)
+void AlarmHandler::remove_AlarmState_dynamic_attribute_no_clean_db(string attname)
{
remove_attribute(attname, true, false);
map<string,Tango::DevEnum>::iterator ite;
@@ -4915,5 +4903,5 @@ void Alarm::remove_AlarmState_dynamic_attribute_no_clean_db(string attname)
}
-/*----- PROTECTED REGION END -----*/ // Alarm::namespace_ending
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::namespace_ending
} // namespace
diff --git a/src/AlarmHandler.h b/src/AlarmHandler.h
index ccd4f0d..759cc14 100644
--- a/src/AlarmHandler.h
+++ b/src/AlarmHandler.h
@@ -1,11 +1,11 @@
-/*----- PROTECTED REGION ID(Alarm.h) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler.h) ENABLED START -----*/
//=============================================================================
//
-// file : Alarm.h
+// file : AlarmHandler.h
//
-// description : Include file for the Alarm class
+// description : Include file for the AlarmHandler class
//
-// project : alarm
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -22,12 +22,7 @@
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
@@ -35,8 +30,8 @@
//=============================================================================
-#ifndef Alarm_H
-#define Alarm_H
+#ifndef AlarmHandler_H
+#define AlarmHandler_H
#include <tango.h>
#include <mysql.h>
@@ -68,14 +63,14 @@ class update_thread;
-/*----- PROTECTED REGION END -----*/ // Alarm.h
+/*----- PROTECTED REGION END -----*/ // AlarmHandler.h
/**
- * Alarm class description:
- * Elettra alarm device server
+ * AlarmHandler class description:
+ * Elettra alarm handler device server
*/
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
enum _AlarmStateEnum {
_NORM,
@@ -88,16 +83,16 @@ enum _AlarmStateEnum {
} ;
typedef _AlarmStateEnum AlarmStateEnum;
-/*----- PROTECTED REGION ID(Alarm::Additional Class Declarations) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::Additional Class Declarations) ENABLED START -----*/
// Additional Class Declarations
-/*----- PROTECTED REGION END -----*/ // Alarm::Additional Class Declarations
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::Additional Class Declarations
-class Alarm : public TANGO_BASE_CLASS
+class AlarmHandler : public TANGO_BASE_CLASS
{
-/*----- PROTECTED REGION ID(Alarm::Data Members) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::Data Members) ENABLED START -----*/
// Add your own data members
public:
@@ -129,7 +124,7 @@ public:
double last_statistics_reset_time;
-/*----- PROTECTED REGION END -----*/ // Alarm::Data Members
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::Data Members
// Device property data members
public:
@@ -163,14 +158,14 @@ public:
* @param cl Class.
* @param s Device Name
*/
- Alarm(Tango::DeviceClass *cl,string &s);
+ AlarmHandler(Tango::DeviceClass *cl,string &s);
/**
* Constructs a newly device object.
*
* @param cl Class.
* @param s Device Name
*/
- Alarm(Tango::DeviceClass *cl,const char *s);
+ AlarmHandler(Tango::DeviceClass *cl,const char *s);
/**
* Constructs a newly device object.
*
@@ -178,11 +173,11 @@ public:
* @param s Device name
* @param d Device description.
*/
- Alarm(Tango::DeviceClass *cl,const char *s,const char *d);
+ AlarmHandler(Tango::DeviceClass *cl,const char *s,const char *d);
/**
* The device object destructor.
*/
- ~Alarm() {delete_device();};
+ ~AlarmHandler() {delete_device();};
// Miscellaneous methods
@@ -209,7 +204,7 @@ public:
public:
//--------------------------------------------------------
/*
- * Method : Alarm::read_attr_hardware()
+ * Method : AlarmHandler::read_attr_hardware()
* Description : Hardware acquisition for attributes.
*/
//--------------------------------------------------------
@@ -357,7 +352,7 @@ public:
//--------------------------------------------------------
/**
- * Method : Alarm::add_dynamic_attributes()
+ * Method : AlarmHandler::add_dynamic_attributes()
* Description : Add dynamic attributes if any.
*/
//--------------------------------------------------------
@@ -459,13 +454,13 @@ public:
//--------------------------------------------------------
/**
- * Method : Alarm::add_dynamic_commands()
+ * Method : AlarmHandler::add_dynamic_commands()
* Description : Add dynamic commands if any.
*/
//--------------------------------------------------------
void add_dynamic_commands();
-/*----- PROTECTED REGION ID(Alarm::Additional Method prototypes) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::Additional Method prototypes) ENABLED START -----*/
// Additional Method prototypes
friend class alarm_thread;
@@ -540,15 +535,15 @@ private:
long port_rw;
#endif
-/*----- PROTECTED REGION END -----*/ // Alarm::Additional Method prototypes
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::Additional Method prototypes
};
-/*----- PROTECTED REGION ID(Alarm::Additional Classes Definitions) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::Additional Classes Definitions) ENABLED START -----*/
// Additional Classes Definitions
-/*----- PROTECTED REGION END -----*/ // Alarm::Additional Classes Definitions
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::Additional Classes Definitions
} // End of namespace
-#endif // Alarm_H
+#endif // AlarmHandler_H
diff --git a/src/AlarmHandler.xmi b/src/AlarmHandler.xmi
index 0d750c1..f43bb35 100644
--- a/src/AlarmHandler.xmi
+++ b/src/AlarmHandler.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
- <classes name="Alarm" pogoRevision="9.4">
- <description description="Elettra alarm device server" title="Elettra alarm device server" sourcePath="/home/graziano/ws/alarm/src" language="Cpp" filestogenerate="XMI file,Code files,Protected Regions" license="GPL" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <classes name="AlarmHandler" pogoRevision="9.4">
+ <description description="Elettra alarm handler device server" title="Elettra alarm handler device server" sourcePath="/home/graziano/ws/alarmhandler/src" language="Cpp" filestogenerate="XMI file,Code files,Protected Regions" license="GPL" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_4Impl" sourcePath=""/>
<identification contact="at elettra.eu - graziano.scalamera" author="graziano.scalamera" emailDomain="elettra.eu" classFamily="SoftwareSystem" siteSpecific="" platform="Unix Like" bus="Not Applicable" manufacturer="" reference=""/>
</description>
diff --git a/src/AlarmHandlerClass.cpp b/src/AlarmHandlerClass.cpp
index 63d494f..a2b7b70 100644
--- a/src/AlarmHandlerClass.cpp
+++ b/src/AlarmHandlerClass.cpp
@@ -1,4 +1,4 @@
-/*----- PROTECTED REGION ID(AlarmClass.cpp) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandlerClass.cpp) ENABLED START -----*/
static const char *RcsId = "$Id: $";
static const char *TagName = "$Name: $";
static const char *CvsPath = "$Source: $";
@@ -6,15 +6,15 @@ static const char *SvnPath = "$HeadURL: $";
static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc/ds_doc/";
//=============================================================================
//
-// file : AlarmClass.cpp
+// file : AlarmHandlerClass.cpp
//
-// description : C++ source for the AlarmClass.
+// description : C++ source for the AlarmHandlerClass.
// A singleton class derived from DeviceClass.
// It implements the command and attribute list
// and all properties and methods required
-// by the Alarm once per process.
+// by the AlarmHandler once per process.
//
-// project : alarm
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -31,12 +31,7 @@ static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
@@ -44,15 +39,13 @@ static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc
//=============================================================================
-#include <tango.h>
-#include <Alarm.h>
-#include <AlarmClass.h>
+#include <AlarmHandlerClass.h>
-/*----- PROTECTED REGION END -----*/ // AlarmClass.cpp
+/*----- PROTECTED REGION END -----*/ // AlarmHandlerClass.cpp
//-------------------------------------------------------------------
/**
- * Create AlarmClass singleton and
+ * Create AlarmHandlerClass singleton and
* return it in a C function for Python usage
*/
//-------------------------------------------------------------------
@@ -63,50 +56,50 @@ __declspec(dllexport)
#endif
- Tango::DeviceClass *_create_Alarm_class(const char *name) {
- return Alarm_ns::AlarmClass::init(name);
+ Tango::DeviceClass *_create_AlarmHandler_class(const char *name) {
+ return AlarmHandler_ns::AlarmHandlerClass::init(name);
}
}
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
//===================================================================
// Initialize pointer for singleton pattern
//===================================================================
-AlarmClass *AlarmClass::_instance = NULL;
+AlarmHandlerClass *AlarmHandlerClass::_instance = NULL;
//--------------------------------------------------------
/**
- * method : AlarmClass::AlarmClass(string &s)
- * description : constructor for the AlarmClass
+ * method : AlarmHandlerClass::AlarmHandlerClass(string &s)
+ * description : constructor for the AlarmHandlerClass
*
* @param s The class name
*/
//--------------------------------------------------------
-AlarmClass::AlarmClass(string &s):Tango::DeviceClass(s)
+AlarmHandlerClass::AlarmHandlerClass(string &s):Tango::DeviceClass(s)
{
- cout2 << "Entering AlarmClass constructor" << endl;
+ cout2 << "Entering AlarmHandlerClass constructor" << endl;
set_default_property();
write_class_property();
- /*----- PROTECTED REGION ID(AlarmClass::constructor) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::constructor) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // AlarmClass::constructor
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::constructor
- cout2 << "Leaving AlarmClass constructor" << endl;
+ cout2 << "Leaving AlarmHandlerClass constructor" << endl;
}
//--------------------------------------------------------
/**
- * method : AlarmClass::~AlarmClass()
- * description : destructor for the AlarmClass
+ * method : AlarmHandlerClass::~AlarmHandlerClass()
+ * description : destructor for the AlarmHandlerClass
*/
//--------------------------------------------------------
-AlarmClass::~AlarmClass()
+AlarmHandlerClass::~AlarmHandlerClass()
{
- /*----- PROTECTED REGION ID(AlarmClass::destructor) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::destructor) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // AlarmClass::destructor
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::destructor
_instance = NULL;
}
@@ -114,21 +107,21 @@ AlarmClass::~AlarmClass()
//--------------------------------------------------------
/**
- * method : AlarmClass::init
+ * method : AlarmHandlerClass::init
* description : Create the object if not already done.
* Otherwise, just return a pointer to the object
*
* @param name The class name
*/
//--------------------------------------------------------
-AlarmClass *AlarmClass::init(const char *name)
+AlarmHandlerClass *AlarmHandlerClass::init(const char *name)
{
if (_instance == NULL)
{
try
{
string s(name);
- _instance = new AlarmClass(s);
+ _instance = new AlarmHandlerClass(s);
}
catch (bad_alloc &)
{
@@ -140,12 +133,12 @@ AlarmClass *AlarmClass::init(const char *name)
//--------------------------------------------------------
/**
- * method : AlarmClass::instance
+ * method : AlarmHandlerClass::instance
* description : Check if object already created,
* and return a pointer to the object
*/
//--------------------------------------------------------
-AlarmClass *AlarmClass::instance()
+AlarmHandlerClass *AlarmHandlerClass::instance()
{
if (_instance == NULL)
{
@@ -176,7 +169,7 @@ CORBA::Any *AckClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_an
cout2 << "AckClass::execute(): arrived" << endl;
const Tango::DevVarStringArray *argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->ack(argin));
+ ((static_cast<AlarmHandler *>(device))->ack(argin));
return new CORBA::Any();
}
@@ -196,7 +189,7 @@ CORBA::Any *LoadClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_a
cout2 << "LoadClass::execute(): arrived" << endl;
Tango::DevString argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->load(argin));
+ ((static_cast<AlarmHandler *>(device))->load(argin));
return new CORBA::Any();
}
@@ -216,7 +209,7 @@ CORBA::Any *RemoveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
cout2 << "RemoveClass::execute(): arrived" << endl;
Tango::DevString argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->remove(argin));
+ ((static_cast<AlarmHandler *>(device))->remove(argin));
return new CORBA::Any();
}
@@ -236,7 +229,7 @@ CORBA::Any *SearchAlarmClass::execute(Tango::DeviceImpl *device, const CORBA::An
cout2 << "SearchAlarmClass::execute(): arrived" << endl;
Tango::DevString argin;
extract(in_any, argin);
- return insert((static_cast<Alarm *>(device))->search_alarm(argin));
+ return insert((static_cast<AlarmHandler *>(device))->search_alarm(argin));
}
//--------------------------------------------------------
@@ -253,7 +246,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;
- ((static_cast<Alarm *>(device))->stop_audible());
+ ((static_cast<AlarmHandler *>(device))->stop_audible());
return new CORBA::Any();
}
@@ -273,7 +266,7 @@ CORBA::Any *SilenceClass::execute(Tango::DeviceImpl *device, const CORBA::Any &i
cout2 << "SilenceClass::execute(): arrived" << endl;
const Tango::DevVarStringArray *argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->silence(argin));
+ ((static_cast<AlarmHandler *>(device))->silence(argin));
return new CORBA::Any();
}
@@ -293,7 +286,7 @@ CORBA::Any *ModifyClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
cout2 << "ModifyClass::execute(): arrived" << endl;
Tango::DevString argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->modify(argin));
+ ((static_cast<AlarmHandler *>(device))->modify(argin));
return new CORBA::Any();
}
@@ -313,7 +306,7 @@ CORBA::Any *ShelveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
cout2 << "ShelveClass::execute(): arrived" << endl;
const Tango::DevVarStringArray *argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->shelve(argin));
+ ((static_cast<AlarmHandler *>(device))->shelve(argin));
return new CORBA::Any();
}
@@ -333,7 +326,7 @@ CORBA::Any *EnableClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
cout2 << "EnableClass::execute(): arrived" << endl;
Tango::DevString argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->enable(argin));
+ ((static_cast<AlarmHandler *>(device))->enable(argin));
return new CORBA::Any();
}
@@ -353,7 +346,7 @@ CORBA::Any *DisableClass::execute(Tango::DeviceImpl *device, const CORBA::Any &i
cout2 << "DisableClass::execute(): arrived" << endl;
Tango::DevString argin;
extract(in_any, argin);
- ((static_cast<Alarm *>(device))->disable(argin));
+ ((static_cast<AlarmHandler *>(device))->disable(argin));
return new CORBA::Any();
}
@@ -371,7 +364,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;
- ((static_cast<Alarm *>(device))->reset_statistics());
+ ((static_cast<AlarmHandler *>(device))->reset_statistics());
return new CORBA::Any();
}
@@ -381,11 +374,11 @@ CORBA::Any *ResetStatisticsClass::execute(Tango::DeviceImpl *device, TANGO_UNUSE
//===================================================================
//--------------------------------------------------------
/**
- * Method : AlarmClass::get_class_property()
+ * Method : AlarmHandlerClass::get_class_property()
* Description : Get the class property for specified name.
*/
//--------------------------------------------------------
-Tango::DbDatum AlarmClass::get_class_property(string &prop_name)
+Tango::DbDatum AlarmHandlerClass::get_class_property(string &prop_name)
{
for (unsigned int i=0 ; i<cl_prop.size() ; i++)
if (cl_prop[i].name == prop_name)
@@ -396,11 +389,11 @@ Tango::DbDatum AlarmClass::get_class_property(string &prop_name)
//--------------------------------------------------------
/**
- * Method : AlarmClass::get_default_device_property()
+ * Method : AlarmHandlerClass::get_default_device_property()
* Description : Return the default value for device property.
*/
//--------------------------------------------------------
-Tango::DbDatum AlarmClass::get_default_device_property(string &prop_name)
+Tango::DbDatum AlarmHandlerClass::get_default_device_property(string &prop_name)
{
for (unsigned int i=0 ; i<dev_def_prop.size() ; i++)
if (dev_def_prop[i].name == prop_name)
@@ -411,11 +404,11 @@ Tango::DbDatum AlarmClass::get_default_device_property(string &prop_name)
//--------------------------------------------------------
/**
- * Method : AlarmClass::get_default_class_property()
+ * Method : AlarmHandlerClass::get_default_class_property()
* Description : Return the default value for class property.
*/
//--------------------------------------------------------
-Tango::DbDatum AlarmClass::get_default_class_property(string &prop_name)
+Tango::DbDatum AlarmHandlerClass::get_default_class_property(string &prop_name)
{
for (unsigned int i=0 ; i<cl_def_prop.size() ; i++)
if (cl_def_prop[i].name == prop_name)
@@ -427,14 +420,14 @@ Tango::DbDatum AlarmClass::get_default_class_property(string &prop_name)
//--------------------------------------------------------
/**
- * Method : AlarmClass::set_default_property()
+ * Method : AlarmHandlerClass::set_default_property()
* Description : Set default property (class and device) for wizard.
* For each property, add to wizard property name and description.
* If default value has been set, add it to wizard property and
* store it in a DbDatum.
*/
//--------------------------------------------------------
-void AlarmClass::set_default_property()
+void AlarmHandlerClass::set_default_property()
{
string prop_name;
string prop_desc;
@@ -489,11 +482,11 @@ void AlarmClass::set_default_property()
//--------------------------------------------------------
/**
- * Method : AlarmClass::write_class_property()
+ * Method : AlarmHandlerClass::write_class_property()
* Description : Set class description fields as property in database
*/
//--------------------------------------------------------
-void AlarmClass::write_class_property()
+void AlarmHandlerClass::write_class_property()
{
// First time, check if database used
if (Tango::Util::_UseDb == false)
@@ -506,14 +499,14 @@ void AlarmClass::write_class_property()
// Put title
Tango::DbDatum title("ProjectTitle");
- string str_title("Elettra alarm device server");
+ string str_title("Elettra alarm handler device server");
title << str_title;
data.push_back(title);
// Put Description
Tango::DbDatum description("Description");
vector<string> str_desc;
- str_desc.push_back("Elettra alarm device server");
+ str_desc.push_back("Elettra alarm handler device server");
description << str_desc;
data.push_back(description);
@@ -534,24 +527,24 @@ void AlarmClass::write_class_property()
//--------------------------------------------------------
/**
- * Method : AlarmClass::device_factory()
+ * Method : AlarmHandlerClass::device_factory()
* Description : Create the device object(s)
* and store them in the device list
*/
//--------------------------------------------------------
-void AlarmClass::device_factory(const Tango::DevVarStringArray *devlist_ptr)
+void AlarmHandlerClass::device_factory(const Tango::DevVarStringArray *devlist_ptr)
{
- /*----- PROTECTED REGION ID(AlarmClass::device_factory_before) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::device_factory_before) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::device_factory_before
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::device_factory_before
// 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;
- device_list.push_back(new Alarm(this, (*devlist_ptr)[i]));
+ device_list.push_back(new AlarmHandler(this, (*devlist_ptr)[i]));
}
// Manage dynamic attributes if any
@@ -561,7 +554,7 @@ void AlarmClass::device_factory(const Tango::DevVarStringArray *devlist_ptr)
for (unsigned long i=1 ; i<=devlist_ptr->length() ; i++)
{
// Add dynamic attributes if any
- Alarm *dev = static_cast<Alarm *>(device_list[device_list.size()-i]);
+ AlarmHandler *dev = static_cast<AlarmHandler *>(device_list[device_list.size()-i]);
dev->add_dynamic_attributes();
// Check before if database used.
@@ -571,26 +564,26 @@ void AlarmClass::device_factory(const Tango::DevVarStringArray *devlist_ptr)
export_device(dev, dev->get_name().c_str());
}
- /*----- PROTECTED REGION ID(AlarmClass::device_factory_after) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::device_factory_after) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::device_factory_after
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::device_factory_after
}
//--------------------------------------------------------
/**
- * Method : AlarmClass::attribute_factory()
+ * Method : AlarmHandlerClass::attribute_factory()
* Description : Create the attribute object(s)
* and store them in the attribute list
*/
//--------------------------------------------------------
-void AlarmClass::attribute_factory(vector<Tango::Attr *> &att_list)
+void AlarmHandlerClass::attribute_factory(vector<Tango::Attr *> &att_list)
{
- /*----- PROTECTED REGION ID(AlarmClass::attribute_factory_before) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::attribute_factory_before) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::attribute_factory_before
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::attribute_factory_before
// Attribute : audibleAlarm
audibleAlarmAttrib *audiblealarm = new audibleAlarmAttrib();
Tango::UserDefaultAttrProp audiblealarm_prop;
@@ -902,46 +895,46 @@ void AlarmClass::attribute_factory(vector<Tango::Attr *> &att_list)
// Create a list of static attributes
create_static_attribute_list(get_class_attr()->get_attr_list());
- /*----- PROTECTED REGION ID(AlarmClass::attribute_factory_after) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::attribute_factory_after) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::attribute_factory_after
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::attribute_factory_after
}
//--------------------------------------------------------
/**
- * Method : AlarmClass::pipe_factory()
+ * Method : AlarmHandlerClass::pipe_factory()
* Description : Create the pipe object(s)
* and store them in the pipe list
*/
//--------------------------------------------------------
-void AlarmClass::pipe_factory()
+void AlarmHandlerClass::pipe_factory()
{
- /*----- PROTECTED REGION ID(AlarmClass::pipe_factory_before) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::pipe_factory_before) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::pipe_factory_before
- /*----- PROTECTED REGION ID(AlarmClass::pipe_factory_after) ENABLED START -----*/
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::pipe_factory_before
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::pipe_factory_after) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::pipe_factory_after
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::pipe_factory_after
}
//--------------------------------------------------------
/**
- * Method : AlarmClass::command_factory()
+ * Method : AlarmHandlerClass::command_factory()
* Description : Create the command object(s)
* and store them in the command list
*/
//--------------------------------------------------------
-void AlarmClass::command_factory()
+void AlarmHandlerClass::command_factory()
{
- /*----- PROTECTED REGION ID(AlarmClass::command_factory_before) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::command_factory_before) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::command_factory_before
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::command_factory_before
// Command Ack
@@ -1043,11 +1036,11 @@ void AlarmClass::command_factory()
Tango::OPERATOR);
command_list.push_back(pResetStatisticsCmd);
- /*----- PROTECTED REGION ID(AlarmClass::command_factory_after) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::command_factory_after) ENABLED START -----*/
// Add your own code
- /*----- PROTECTED REGION END -----*/ // AlarmClass::command_factory_after
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::command_factory_after
}
//===================================================================
@@ -1056,13 +1049,13 @@ void AlarmClass::command_factory()
//--------------------------------------------------------
/**
- * method : AlarmClass::create_static_attribute_list
+ * method : AlarmHandlerClass::create_static_attribute_list
* description : Create the a list of static attributes
*
* @param att_list the ceated attribute list
*/
//--------------------------------------------------------
-void AlarmClass::create_static_attribute_list(vector<Tango::Attr *> &att_list)
+void AlarmHandlerClass::create_static_attribute_list(vector<Tango::Attr *> &att_list)
{
for (unsigned long i=0 ; i<att_list.size() ; i++)
{
@@ -1073,29 +1066,29 @@ void AlarmClass::create_static_attribute_list(vector<Tango::Attr *> &att_list)
cout2 << defaultAttList.size() << " attributes in default list" << endl;
- /*----- PROTECTED REGION ID(AlarmClass::create_static_att_list) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::create_static_att_list) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // AlarmClass::create_static_att_list
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::create_static_att_list
}
//--------------------------------------------------------
/**
- * method : AlarmClass::erase_dynamic_attributes
+ * method : AlarmHandlerClass::erase_dynamic_attributes
* description : delete the dynamic attributes if any.
*
* @param devlist_ptr the device list pointer
* @param list of all attributes
*/
//--------------------------------------------------------
-void AlarmClass::erase_dynamic_attributes(const Tango::DevVarStringArray *devlist_ptr, vector<Tango::Attr *> &att_list)
+void AlarmHandlerClass::erase_dynamic_attributes(const Tango::DevVarStringArray *devlist_ptr, vector<Tango::Attr *> &att_list)
{
Tango::Util *tg = Tango::Util::instance();
for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
{
Tango::DeviceImpl *dev_impl = tg->get_device_by_name(((string)(*devlist_ptr)[i]).c_str());
- Alarm *dev = static_cast<Alarm *> (dev_impl);
+ AlarmHandler *dev = static_cast<AlarmHandler *> (dev_impl);
vector<Tango::Attribute *> &dev_att_list = dev->get_device_attr()->get_attribute_list();
vector<Tango::Attribute *>::iterator ite_att;
@@ -1114,18 +1107,18 @@ void AlarmClass::erase_dynamic_attributes(const Tango::DevVarStringArray *devlis
}
}
}
- /*----- PROTECTED REGION ID(AlarmClass::erase_dynamic_attributes) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::erase_dynamic_attributes) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // AlarmClass::erase_dynamic_attributes
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::erase_dynamic_attributes
}
//--------------------------------------------------------
/**
- * Method : AlarmClass::get_attr_by_name()
+ * Method : AlarmHandlerClass::get_attr_by_name()
* Description : returns Tango::Attr * object found by name
*/
//--------------------------------------------------------
-Tango::Attr *AlarmClass::get_attr_object_by_name(vector<Tango::Attr *> &att_list, string attname)
+Tango::Attr *AlarmHandlerClass::get_attr_object_by_name(vector<Tango::Attr *> &att_list, string attname)
{
vector<Tango::Attr *>::iterator it;
for (it=att_list.begin() ; it<att_list.end() ; ++it)
@@ -1136,7 +1129,7 @@ Tango::Attr *AlarmClass::get_attr_object_by_name(vector<Tango::Attr *> &att_list
}
-/*----- PROTECTED REGION ID(AlarmClass::Additional Methods) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandlerClass::Additional Methods) ENABLED START -----*/
-/*----- PROTECTED REGION END -----*/ // AlarmClass::Additional Methods
+/*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::Additional Methods
} // namespace
diff --git a/src/AlarmHandlerClass.h b/src/AlarmHandlerClass.h
index 1b2a25d..9ba831c 100644
--- a/src/AlarmHandlerClass.h
+++ b/src/AlarmHandlerClass.h
@@ -1,15 +1,15 @@
-/*----- PROTECTED REGION ID(AlarmClass.h) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandlerClass.h) ENABLED START -----*/
//=============================================================================
//
-// file : AlarmClass.h
+// file : AlarmHandlerClass.h
//
-// description : Include for the Alarm root class.
+// description : Include for the AlarmHandler root class.
// This class is the singleton class for
-// the Alarm device class.
+// the AlarmHandler device class.
// It contains all properties and methods which the
-// Alarm requires only once e.g. the commands.
+// AlarmHandler requires only once e.g. the commands.
//
-// project : alarm
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -26,12 +26,7 @@
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
@@ -39,21 +34,22 @@
//=============================================================================
-#ifndef AlarmClass_H
-#define AlarmClass_H
+#ifndef AlarmHandlerClass_H
+#define AlarmHandlerClass_H
#include <tango.h>
-#include <Alarm.h>
+#include <AlarmHandler.h>
+
-/*----- PROTECTED REGION END -----*/ // AlarmClass.h
+/*----- PROTECTED REGION END -----*/ // AlarmHandlerClass.h
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
-/*----- PROTECTED REGION ID(AlarmClass::classes for dynamic creation) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandlerClass::classes for dynamic creation) ENABLED START -----*/
-/*----- PROTECTED REGION END -----*/ // AlarmClass::classes for dynamic creation
+/*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::classes for dynamic creation
//=========================================
// Define classes for attributes
@@ -66,9 +62,9 @@ public:
Tango::DEV_BOOLEAN, Tango::READ) {};
~audibleAlarmAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_audibleAlarm(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_audibleAlarm(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_audibleAlarm_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_audibleAlarm_allowed(ty);}
};
// Attribute StatisticsResetTime class definition
@@ -79,9 +75,9 @@ public:
Tango::DEV_DOUBLE, Tango::READ) {};
~StatisticsResetTimeAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_StatisticsResetTime(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_StatisticsResetTime(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_StatisticsResetTime_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_StatisticsResetTime_allowed(ty);}
};
// Attribute alarm class definition
@@ -92,9 +88,9 @@ public:
Tango::DEV_STRING, Tango::READ, 1024) {};
~alarmAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_alarm(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_alarm(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_alarm_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_alarm_allowed(ty);}
};
// Attribute normalAlarms class definition
@@ -105,9 +101,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~normalAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_normalAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_normalAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_normalAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_normalAlarms_allowed(ty);}
};
// Attribute unacknowledgedAlarms class definition
@@ -118,9 +114,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~unacknowledgedAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_unacknowledgedAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_unacknowledgedAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_unacknowledgedAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_unacknowledgedAlarms_allowed(ty);}
};
// Attribute acknowledgedAlarms class definition
@@ -131,9 +127,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~acknowledgedAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_acknowledgedAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_acknowledgedAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_acknowledgedAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_acknowledgedAlarms_allowed(ty);}
};
// Attribute unacknowledgedNormalAlarms class definition
@@ -144,9 +140,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~unacknowledgedNormalAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_unacknowledgedNormalAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_unacknowledgedNormalAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_unacknowledgedNormalAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_unacknowledgedNormalAlarms_allowed(ty);}
};
// Attribute shelvedAlarms class definition
@@ -157,9 +153,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~shelvedAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_shelvedAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_shelvedAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_shelvedAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_shelvedAlarms_allowed(ty);}
};
// Attribute outOfServiceAlarms class definition
@@ -170,9 +166,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~outOfServiceAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_outOfServiceAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_outOfServiceAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_outOfServiceAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_outOfServiceAlarms_allowed(ty);}
};
// Attribute silencedAlarms class definition
@@ -183,9 +179,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~silencedAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_silencedAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_silencedAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_silencedAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_silencedAlarms_allowed(ty);}
};
// Attribute listAlarms class definition
@@ -196,9 +192,9 @@ public:
Tango::DEV_STRING, Tango::READ, 10000) {};
~listAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_listAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_listAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_listAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_listAlarms_allowed(ty);}
};
// Attribute frequencyAlarms class definition
@@ -209,9 +205,9 @@ public:
Tango::DEV_DOUBLE, Tango::READ, 10000) {};
~frequencyAlarmsAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_frequencyAlarms(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_frequencyAlarms(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_frequencyAlarms_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_frequencyAlarms_allowed(ty);}
};
@@ -226,9 +222,9 @@ public:
Tango::DEV_ENUM, Tango::READ) {};
~AlarmStateAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_AlarmState(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_AlarmState(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_AlarmState_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_AlarmState_allowed(ty);}
virtual bool same_type(const type_info &in_type) {return typeid(AlarmStateEnum) == in_type;}
virtual string get_enum_type() {return string("AlarmStateEnum");}
};
@@ -241,9 +237,9 @@ public:
Tango::DEV_STRING, Tango::READ) {};
~AlarmFormulaAttrib() {};
virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att)
- {(static_cast<Alarm *>(dev))->read_AlarmFormula(att);}
+ {(static_cast<AlarmHandler *>(dev))->read_AlarmFormula(att);}
virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty)
- {return (static_cast<Alarm *>(dev))->is_AlarmFormula_allowed(ty);}
+ {return (static_cast<AlarmHandler *>(dev))->is_AlarmFormula_allowed(ty);}
};
@@ -270,7 +266,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Ack_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Ack_allowed(any);}
};
// Command Load class definition
@@ -293,7 +289,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Load_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Load_allowed(any);}
};
// Command Remove class definition
@@ -316,7 +312,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Remove_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Remove_allowed(any);}
};
// Command SearchAlarm class definition
@@ -339,7 +335,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_SearchAlarm_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_SearchAlarm_allowed(any);}
};
// Command StopAudible class definition
@@ -362,7 +358,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_StopAudible_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_StopAudible_allowed(any);}
};
// Command Silence class definition
@@ -385,7 +381,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Silence_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Silence_allowed(any);}
};
// Command Modify class definition
@@ -408,7 +404,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Modify_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Modify_allowed(any);}
};
// Command Shelve class definition
@@ -431,7 +427,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Shelve_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Shelve_allowed(any);}
};
// Command Enable class definition
@@ -454,7 +450,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Enable_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Enable_allowed(any);}
};
// Command Disable class definition
@@ -477,7 +473,7 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_Disable_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_Disable_allowed(any);}
};
// Command ResetStatistics class definition
@@ -500,24 +496,24 @@ public:
virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
- {return (static_cast<Alarm *>(dev))->is_ResetStatistics_allowed(any);}
+ {return (static_cast<AlarmHandler *>(dev))->is_ResetStatistics_allowed(any);}
};
/**
- * The AlarmClass singleton definition
+ * The AlarmHandlerClass singleton definition
*/
#ifdef _TG_WINDOWS_
-class __declspec(dllexport) AlarmClass : public Tango::DeviceClass
+class __declspec(dllexport) AlarmHandlerClass : public Tango::DeviceClass
#else
-class AlarmClass : public Tango::DeviceClass
+class AlarmHandlerClass : public Tango::DeviceClass
#endif
{
- /*----- PROTECTED REGION ID(AlarmClass::Additionnal DServer data members) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandlerClass::Additionnal DServer data members) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // AlarmClass::Additionnal DServer data members
+ /*----- PROTECTED REGION END -----*/ // AlarmHandlerClass::Additionnal DServer data members
public:
// write class properties data members
@@ -526,16 +522,16 @@ class AlarmClass : public Tango::DeviceClass
Tango::DbData dev_def_prop;
// Method prototypes
- static AlarmClass *init(const char *);
- static AlarmClass *instance();
- ~AlarmClass();
+ static AlarmHandlerClass *init(const char *);
+ static AlarmHandlerClass *instance();
+ ~AlarmHandlerClass();
Tango::DbDatum get_class_property(string &);
Tango::DbDatum get_default_device_property(string &);
Tango::DbDatum get_default_class_property(string &);
protected:
- AlarmClass(string &);
- static AlarmClass *_instance;
+ AlarmHandlerClass(string &);
+ static AlarmHandlerClass *_instance;
void command_factory();
void attribute_factory(vector<Tango::Attr *> &);
void pipe_factory();
@@ -555,4 +551,4 @@ class AlarmClass : public Tango::DeviceClass
} // End of namespace
-#endif // Alarm_H
+#endif // AlarmHandler_H
diff --git a/src/AlarmHandlerDynAttrUtils.cpp b/src/AlarmHandlerDynAttrUtils.cpp
index 87084ee..74df9f2 100644
--- a/src/AlarmHandlerDynAttrUtils.cpp
+++ b/src/AlarmHandlerDynAttrUtils.cpp
@@ -1,12 +1,11 @@
-/*----- PROTECTED REGION ID(Alarm::DynAttrUtils.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: $";
+/*----- PROTECTED REGION ID(AlarmHandler::DynAttrUtils.cpp) ENABLED START -----*/
//=============================================================================
//
-// file : AlarmDynAttrUtils.cpp
+// file : AlarmHandlerDynAttrUtils.cpp
//
-// description : Dynamic attributes utilities file for the Alarm class
+// description : Dynamic attributes utilities file for the AlarmHandler class
//
-// project : Elettra alarm device server
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -23,12 +22,7 @@ static const char *RcsId = "$Id: $";
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
@@ -36,10 +30,10 @@ static const char *RcsId = "$Id: $";
//=============================================================================
-#include <Alarm.h>
-#include <AlarmClass.h>
+#include <AlarmHandler.h>
+#include <AlarmHandlerClass.h>
-/*----- PROTECTED REGION END -----*/ // Alarm::DynAttrUtils.cpp
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::DynAttrUtils.cpp
//================================================================
// Attributes managed are:
@@ -48,7 +42,7 @@ static const char *RcsId = "$Id: $";
// AlarmFormula | Tango::DevString Scalar
//================================================================
-// For compatibility reason, this file (AlarmDynAttrUtils)
+// For compatibility reason, this file (AlarmHandlerDynAttrUtils)
// manage also the dynamic command utilities.
//================================================================
// The following table gives the correspondence
@@ -58,7 +52,7 @@ static const char *RcsId = "$Id: $";
//================================================================
//================================================================
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
//=============================================================
// Add/Remove dynamic attribute methods
@@ -71,7 +65,7 @@ namespace Alarm_ns
* parameter attname: attribute name to be cretated and added.
*/
//--------------------------------------------------------
-void Alarm::add_AlarmState_dynamic_attribute(string attname)
+void AlarmHandler::add_AlarmState_dynamic_attribute(string attname)
{
// Attribute : AlarmState
AlarmStateAttrib *alarmstate = new AlarmStateAttrib(attname);
@@ -91,7 +85,7 @@ void Alarm::add_AlarmState_dynamic_attribute(string attname)
// delta_t not set for AlarmState
// delta_val not set for AlarmState
- /*----- PROTECTED REGION ID(Alarm::att_AlarmState_dynamic_attribute) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::att_AlarmState_dynamic_attribute) ENABLED START -----*/
DEBUG_STREAM << __func__<<": entering name="<<attname;
alarm_container_t::iterator i = alarms.v_alarm.find(attname);
if(i != alarms.v_alarm.end())
@@ -103,7 +97,7 @@ void Alarm::add_AlarmState_dynamic_attribute(string attname)
INFO_STREAM << __func__<<": name="<<attname<<" NOT FOUND while looking for formula to add as attribute description";
}
- /*----- PROTECTED REGION END -----*/ // Alarm::att_AlarmState_dynamic_attribute
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::att_AlarmState_dynamic_attribute
{
vector<string> labels;
labels.push_back("NORM");
@@ -131,15 +125,15 @@ void Alarm::add_AlarmState_dynamic_attribute(string attname)
* parameter attname: attribute name to be removed.
*/
//--------------------------------------------------------
-void Alarm::remove_AlarmState_dynamic_attribute(string attname)
+void AlarmHandler::remove_AlarmState_dynamic_attribute(string attname)
{
remove_attribute(attname, true);
map<string,Tango::DevEnum>::iterator ite;
if ((ite=AlarmState_data.find(attname))!=AlarmState_data.end())
{
- /*----- PROTECTED REGION ID(Alarm::remove_AlarmState_dynamic_attribute) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::remove_AlarmState_dynamic_attribute) ENABLED START -----*/
DEBUG_STREAM << __func__<<": entering name="<<attname;
- /*----- PROTECTED REGION END -----*/ // Alarm::remove_AlarmState_dynamic_attribute
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::remove_AlarmState_dynamic_attribute
AlarmState_data.erase(ite);
}
}
@@ -150,7 +144,7 @@ void Alarm::remove_AlarmState_dynamic_attribute(string attname)
* parameter attname: attribute name to be cretated and added.
*/
//--------------------------------------------------------
-void Alarm::add_AlarmFormula_dynamic_attribute(string attname)
+void AlarmHandler::add_AlarmFormula_dynamic_attribute(string attname)
{
// Attribute : AlarmFormula
AlarmFormulaAttrib *alarmformula = new AlarmFormulaAttrib(attname);
@@ -170,10 +164,10 @@ void Alarm::add_AlarmFormula_dynamic_attribute(string attname)
// delta_t not set for AlarmFormula
// delta_val not set for AlarmFormula
- /*----- PROTECTED REGION ID(Alarm::att_AlarmFormula_dynamic_attribute) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::att_AlarmFormula_dynamic_attribute) ENABLED START -----*/
DEBUG_STREAM << __func__<<": entering name="<<attname;
- /*----- PROTECTED REGION END -----*/ // Alarm::att_AlarmFormula_dynamic_attribute
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::att_AlarmFormula_dynamic_attribute
alarmformula->set_default_properties(alarmformula_prop);
// Not Polled
alarmformula->set_disp_level(Tango::OPERATOR);
@@ -192,15 +186,15 @@ void Alarm::add_AlarmFormula_dynamic_attribute(string attname)
* parameter attname: attribute name to be removed.
*/
//--------------------------------------------------------
-void Alarm::remove_AlarmFormula_dynamic_attribute(string attname)
+void AlarmHandler::remove_AlarmFormula_dynamic_attribute(string attname)
{
remove_attribute(attname, true);
map<string,Tango::DevString>::iterator ite;
if ((ite=AlarmFormula_data.find(attname))!=AlarmFormula_data.end())
{
- /*----- PROTECTED REGION ID(Alarm::remove_AlarmFormula_dynamic_attribute) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::remove_AlarmFormula_dynamic_attribute) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::remove_AlarmFormula_dynamic_attribute
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::remove_AlarmFormula_dynamic_attribute
AlarmFormula_data.erase(ite);
}
}
@@ -216,7 +210,7 @@ void Alarm::remove_AlarmFormula_dynamic_attribute(string attname)
* parameter attname: the specified attribute name.
*/
//--------------------------------------------------------
-Tango::DevEnum *Alarm::get_AlarmState_data_ptr(string &name)
+Tango::DevEnum *AlarmHandler::get_AlarmState_data_ptr(string &name)
{
map<string,Tango::DevEnum>::iterator ite;
if ((ite=AlarmState_data.find(name))==AlarmState_data.end())
@@ -226,7 +220,7 @@ Tango::DevEnum *Alarm::get_AlarmState_data_ptr(string &name)
Tango::Except::throw_exception(
(const char *)"ATTRIBUTE_NOT_FOUND",
tms.str().c_str(),
- (const char *)"Alarm::get_AlarmState_data_ptr()");
+ (const char *)"AlarmHandler::get_AlarmState_data_ptr()");
}
return &(ite->second);
}
@@ -237,7 +231,7 @@ Tango::DevEnum *Alarm::get_AlarmState_data_ptr(string &name)
* parameter attname: the specified attribute name.
*/
//--------------------------------------------------------
-Tango::DevString *Alarm::get_AlarmFormula_data_ptr(string &name)
+Tango::DevString *AlarmHandler::get_AlarmFormula_data_ptr(string &name)
{
map<string,Tango::DevString>::iterator ite;
if ((ite=AlarmFormula_data.find(name))==AlarmFormula_data.end())
@@ -247,7 +241,7 @@ Tango::DevString *Alarm::get_AlarmFormula_data_ptr(string &name)
Tango::Except::throw_exception(
(const char *)"ATTRIBUTE_NOT_FOUND",
tms.str().c_str(),
- (const char *)"Alarm::get_AlarmFormula_data_ptr()");
+ (const char *)"AlarmHandler::get_AlarmFormula_data_ptr()");
}
return &(ite->second);
}
diff --git a/src/AlarmHandlerStateMachine.cpp b/src/AlarmHandlerStateMachine.cpp
index d05999e..8fc1514 100644
--- a/src/AlarmHandlerStateMachine.cpp
+++ b/src/AlarmHandlerStateMachine.cpp
@@ -1,12 +1,11 @@
-/*----- PROTECTED REGION ID(AlarmStateMachine.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: $";
+/*----- PROTECTED REGION ID(AlarmHandlerStateMachine.cpp) ENABLED START -----*/
//=============================================================================
//
-// file : AlarmStateMachine.cpp
+// file : AlarmHandlerStateMachine.cpp
//
-// description : State machine file for the Alarm class
+// description : State machine file for the AlarmHandler class
//
-// project : alarm
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -23,28 +22,23 @@ static const char *RcsId = "$Id: $";
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
//=============================================================================
-#include <Alarm.h>
+#include <AlarmHandler.h>
-/*----- PROTECTED REGION END -----*/ // Alarm::AlarmStateMachine.cpp
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::AlarmHandlerStateMachine.cpp
//================================================================
// States | Description
//================================================================
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
//=================================================
// Attributes Allowed Methods
@@ -52,225 +46,225 @@ namespace Alarm_ns
//--------------------------------------------------------
/**
- * Method : Alarm::is_audibleAlarm_allowed()
+ * Method : AlarmHandler::is_audibleAlarm_allowed()
* Description : Execution allowed for audibleAlarm attribute
*/
//--------------------------------------------------------
-bool Alarm::is_audibleAlarm_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_audibleAlarm_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for audibleAlarm attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::audibleAlarmStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::audibleAlarmStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::audibleAlarmStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::audibleAlarmStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_StatisticsResetTime_allowed()
+ * Method : AlarmHandler::is_StatisticsResetTime_allowed()
* Description : Execution allowed for StatisticsResetTime attribute
*/
//--------------------------------------------------------
-bool Alarm::is_StatisticsResetTime_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_StatisticsResetTime_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for StatisticsResetTime attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::StatisticsResetTimeStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::StatisticsResetTimeStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::StatisticsResetTimeStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::StatisticsResetTimeStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_alarm_allowed()
+ * Method : AlarmHandler::is_alarm_allowed()
* Description : Execution allowed for alarm attribute
*/
//--------------------------------------------------------
-bool Alarm::is_alarm_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_alarm_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for alarm attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::alarmStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::alarmStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::alarmStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::alarmStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_normalAlarms_allowed()
+ * Method : AlarmHandler::is_normalAlarms_allowed()
* Description : Execution allowed for normalAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_normalAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_normalAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for normalAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::normalAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::normalAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::normalAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::normalAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_unacknowledgedAlarms_allowed()
+ * Method : AlarmHandler::is_unacknowledgedAlarms_allowed()
* Description : Execution allowed for unacknowledgedAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_unacknowledgedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_unacknowledgedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for unacknowledgedAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::unacknowledgedAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::unacknowledgedAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::unacknowledgedAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::unacknowledgedAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_acknowledgedAlarms_allowed()
+ * Method : AlarmHandler::is_acknowledgedAlarms_allowed()
* Description : Execution allowed for acknowledgedAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_acknowledgedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_acknowledgedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for acknowledgedAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::acknowledgedAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::acknowledgedAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::acknowledgedAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::acknowledgedAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_unacknowledgedNormalAlarms_allowed()
+ * Method : AlarmHandler::is_unacknowledgedNormalAlarms_allowed()
* Description : Execution allowed for unacknowledgedNormalAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_unacknowledgedNormalAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_unacknowledgedNormalAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for unacknowledgedNormalAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::unacknowledgedNormalAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::unacknowledgedNormalAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::unacknowledgedNormalAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::unacknowledgedNormalAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_shelvedAlarms_allowed()
+ * Method : AlarmHandler::is_shelvedAlarms_allowed()
* Description : Execution allowed for shelvedAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_shelvedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_shelvedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for shelvedAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::shelvedAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::shelvedAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::shelvedAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::shelvedAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_outOfServiceAlarms_allowed()
+ * Method : AlarmHandler::is_outOfServiceAlarms_allowed()
* Description : Execution allowed for outOfServiceAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_outOfServiceAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_outOfServiceAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for outOfServiceAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::outOfServiceAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::outOfServiceAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::outOfServiceAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::outOfServiceAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_silencedAlarms_allowed()
+ * Method : AlarmHandler::is_silencedAlarms_allowed()
* Description : Execution allowed for silencedAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_silencedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_silencedAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for silencedAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::silencedAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::silencedAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::silencedAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::silencedAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_listAlarms_allowed()
+ * Method : AlarmHandler::is_listAlarms_allowed()
* Description : Execution allowed for listAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_listAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_listAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for listAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::listAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::listAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::listAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::listAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_frequencyAlarms_allowed()
+ * Method : AlarmHandler::is_frequencyAlarms_allowed()
* Description : Execution allowed for frequencyAlarms attribute
*/
//--------------------------------------------------------
-bool Alarm::is_frequencyAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_frequencyAlarms_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for frequencyAlarms attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::frequencyAlarmsStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::frequencyAlarmsStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::frequencyAlarmsStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::frequencyAlarmsStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_AlarmState_allowed()
+ * Method : AlarmHandler::is_AlarmState_allowed()
* Description : Execution allowed for AlarmState attribute
*/
//--------------------------------------------------------
-bool Alarm::is_AlarmState_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_AlarmState_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for AlarmState attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::AlarmStateStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::AlarmStateStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::AlarmStateStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::AlarmStateStateAllowed_READ
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_AlarmFormula_allowed()
+ * Method : AlarmHandler::is_AlarmFormula_allowed()
* Description : Execution allowed for AlarmFormula attribute
*/
//--------------------------------------------------------
-bool Alarm::is_AlarmFormula_allowed(TANGO_UNUSED(Tango::AttReqType type))
+bool AlarmHandler::is_AlarmFormula_allowed(TANGO_UNUSED(Tango::AttReqType type))
{
// Not any excluded states for AlarmFormula attribute in read access.
- /*----- PROTECTED REGION ID(Alarm::AlarmFormulaStateAllowed_READ) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::AlarmFormulaStateAllowed_READ) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::AlarmFormulaStateAllowed_READ
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::AlarmFormulaStateAllowed_READ
return true;
}
@@ -281,174 +275,174 @@ bool Alarm::is_AlarmFormula_allowed(TANGO_UNUSED(Tango::AttReqType type))
//--------------------------------------------------------
/**
- * Method : Alarm::is_Ack_allowed()
+ * Method : AlarmHandler::is_Ack_allowed()
* Description : Execution allowed for Ack attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Ack_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Ack_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Ack command.
- /*----- PROTECTED REGION ID(Alarm::AckStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::AckStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::AckStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::AckStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Load_allowed()
+ * Method : AlarmHandler::is_Load_allowed()
* Description : Execution allowed for Load attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Load_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Load_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Load command.
- /*----- PROTECTED REGION ID(Alarm::LoadStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::LoadStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::LoadStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::LoadStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Remove_allowed()
+ * Method : AlarmHandler::is_Remove_allowed()
* Description : Execution allowed for Remove attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Remove_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Remove_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Remove command.
- /*----- PROTECTED REGION ID(Alarm::RemoveStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::RemoveStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::RemoveStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::RemoveStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_SearchAlarm_allowed()
+ * Method : AlarmHandler::is_SearchAlarm_allowed()
* Description : Execution allowed for SearchAlarm attribute
*/
//--------------------------------------------------------
-bool Alarm::is_SearchAlarm_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_SearchAlarm_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for SearchAlarm command.
- /*----- PROTECTED REGION ID(Alarm::SearchAlarmStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::SearchAlarmStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::SearchAlarmStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::SearchAlarmStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_StopAudible_allowed()
+ * Method : AlarmHandler::is_StopAudible_allowed()
* Description : Execution allowed for StopAudible attribute
*/
//--------------------------------------------------------
-bool Alarm::is_StopAudible_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_StopAudible_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for StopAudible command.
- /*----- PROTECTED REGION ID(Alarm::StopAudibleStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::StopAudibleStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::StopAudibleStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::StopAudibleStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Silence_allowed()
+ * Method : AlarmHandler::is_Silence_allowed()
* Description : Execution allowed for Silence attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Silence_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Silence_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Silence command.
- /*----- PROTECTED REGION ID(Alarm::SilenceStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::SilenceStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::SilenceStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::SilenceStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Modify_allowed()
+ * Method : AlarmHandler::is_Modify_allowed()
* Description : Execution allowed for Modify attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Modify_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Modify_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Modify command.
- /*----- PROTECTED REGION ID(Alarm::ModifyStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::ModifyStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::ModifyStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::ModifyStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Shelve_allowed()
+ * Method : AlarmHandler::is_Shelve_allowed()
* Description : Execution allowed for Shelve attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Shelve_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Shelve_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Shelve command.
- /*----- PROTECTED REGION ID(Alarm::ShelveStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::ShelveStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::ShelveStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::ShelveStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Enable_allowed()
+ * Method : AlarmHandler::is_Enable_allowed()
* Description : Execution allowed for Enable attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Enable_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Enable_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Enable command.
- /*----- PROTECTED REGION ID(Alarm::EnableStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::EnableStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::EnableStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::EnableStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_Disable_allowed()
+ * Method : AlarmHandler::is_Disable_allowed()
* Description : Execution allowed for Disable attribute
*/
//--------------------------------------------------------
-bool Alarm::is_Disable_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_Disable_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for Disable command.
- /*----- PROTECTED REGION ID(Alarm::DisableStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::DisableStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::DisableStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::DisableStateAllowed
return true;
}
//--------------------------------------------------------
/**
- * Method : Alarm::is_ResetStatistics_allowed()
+ * Method : AlarmHandler::is_ResetStatistics_allowed()
* Description : Execution allowed for ResetStatistics attribute
*/
//--------------------------------------------------------
-bool Alarm::is_ResetStatistics_allowed(TANGO_UNUSED(const CORBA::Any &any))
+bool AlarmHandler::is_ResetStatistics_allowed(TANGO_UNUSED(const CORBA::Any &any))
{
// Not any excluded states for ResetStatistics command.
- /*----- PROTECTED REGION ID(Alarm::ResetStatisticsStateAllowed) ENABLED START -----*/
+ /*----- PROTECTED REGION ID(AlarmHandler::ResetStatisticsStateAllowed) ENABLED START -----*/
- /*----- PROTECTED REGION END -----*/ // Alarm::ResetStatisticsStateAllowed
+ /*----- PROTECTED REGION END -----*/ // AlarmHandler::ResetStatisticsStateAllowed
return true;
}
-/*----- PROTECTED REGION ID(Alarm::AlarmStateAllowed.AdditionalMethods) ENABLED START -----*/
+/*----- PROTECTED REGION ID(AlarmHandler::AlarmHandlerStateAllowed.AdditionalMethods) ENABLED START -----*/
// Additional Methods
-/*----- PROTECTED REGION END -----*/ // Alarm::AlarmStateAllowed.AdditionalMethods
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::AlarmHandlerStateAllowed.AdditionalMethods
} // End of namespace
diff --git a/src/ClassFactory.cpp b/src/ClassFactory.cpp
index 065b2f9..a847816 100644
--- a/src/ClassFactory.cpp
+++ b/src/ClassFactory.cpp
@@ -1,49 +1,50 @@
-/*----- PROTECTED REGION ID(Alarm::ClassFactory.cpp) ENABLED START -----*/
-static const char *RcsId = "$Header: /home/cvsadm/cvsroot/utils/alarm/tango/server/src/ClassFactory.cpp,v 1.2 2008-03-27 09:25:29 graziano Exp $";
-//+=============================================================================
+/*----- PROTECTED REGION ID(AlarmHandler::ClassFactory.cpp) ENABLED START -----*/
+//=============================================================================
//
// file : ClassFactory.cpp
//
// description : C++ source for the class_factory method of the DServer
-// device class. This method is responsible to create
-// all class singletin for a device server. It is called
-// at device server startup
-//
-// project : TANGO Device Server
-//
-// $Author: graziano $
-//
-// $Revision: 1.2 $
-//
-// copyleft : Sincrotrone Trieste S.C.p.A. di interesse nazionale
-// Strada Statale 14 - km 163,5 in AREA Science Park
-// 34012 Basovizza, Trieste ITALY
-// Tel. +39 040 37581
-// Fax. +39 040 9380902
-//
-//-=============================================================================
+// device class. This method is responsible for the creation of
+// all class singleton for a device server. It is called
+// at device server startup.
+//
+// project : Elettra alarm handler device server
+//
+// This file is part of Tango device class.
+//
+// Tango is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Tango is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Tango. If not, see <http://www.gnu.org/licenses/>.
+//
//
-// This file is generated by POGO
-// (Program Obviously used to Generate tango Object)
//
-// (c) - ELETTRA U.O. Controlli
//=============================================================================
-
+// This file is generated by POGO
+// (Program Obviously used to Generate tango Object)
+//=============================================================================
#include <tango.h>
-#include <AlarmClass.h>
+#include <AlarmHandlerClass.h>
+
+// Add class header files if needed
+
/**
- * Create AlarmClass singleton and store it in DServer object.
- *
- * @author $Author: graziano $
- * @version $Revision: 1.2 $ $
+ * Create AlarmHandler Class singleton and store it in DServer object.
*/
void Tango::DServer::class_factory()
{
-
- add_class(Alarm_ns::AlarmClass::init("Alarm"));
-
+ // Add method class init if needed
+ add_class(AlarmHandler_ns::AlarmHandlerClass::init("AlarmHandler"));
}
-/*----- PROTECTED REGION END -----*/ // Alarm::ClassFactory.cpp
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::ClassFactory.cpp
diff --git a/src/SubscribeThread.cpp b/src/SubscribeThread.cpp
index 0ee1711..6246345 100644
--- a/src/SubscribeThread.cpp
+++ b/src/SubscribeThread.cpp
@@ -41,16 +41,16 @@ static const char *RcsId = "$Header: /home/cvsadm/cvsroot/fermi/servers/hdb++/hd
//-=============================================================================
-#include "Alarm.h"
+#include "AlarmHandler.h"
#include "event_table.h"
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
//=============================================================================
//=============================================================================
-SubscribeThread::SubscribeThread(Alarm *dev):Tango::LogAdapter(dev)
+SubscribeThread::SubscribeThread(AlarmHandler *dev):Tango::LogAdapter(dev)
{
alarm_dev = dev;
period = 1;
diff --git a/src/SubscribeThread.h b/src/SubscribeThread.h
index e34ddfd..f3b38cc 100644
--- a/src/SubscribeThread.h
+++ b/src/SubscribeThread.h
@@ -52,11 +52,11 @@
// constants definitions here.
//-----------------------------------------------
-namespace Alarm_ns
+namespace AlarmHandler_ns
{
//class ArchiveCB;
-class Alarm;
+class AlarmHandler;
class SubscribeThread;
@@ -75,12 +75,12 @@ private:
/**
* HdbDevice object
*/
- Alarm *alarm_dev;
+ AlarmHandler *alarm_dev;
public:
int period;
- SubscribeThread(Alarm *dev);
+ SubscribeThread(AlarmHandler *dev);
void updateProperty();
/**
* Execute the thread loop.
diff --git a/src/alarm-thread.cpp b/src/alarm-thread.cpp
index 2d35a71..dd7af21 100644
--- a/src/alarm-thread.cpp
+++ b/src/alarm-thread.cpp
@@ -34,7 +34,7 @@ static const char __FILE__rev[] = __FILE__ " $Revision: 1.7 $";
/*
* alarm_thread::alarm_thread()
*/
-alarm_thread::alarm_thread(Alarm_ns::Alarm *p) : p_Alarm(p)
+alarm_thread::alarm_thread(AlarmHandler_ns::AlarmHandler *p) : p_Alarm(p)
{
//cout << __FILE__rev << endl;
}
diff --git a/src/alarm-thread.h b/src/alarm-thread.h
index 58d40e7..3c75a80 100644
--- a/src/alarm-thread.h
+++ b/src/alarm-thread.h
@@ -21,7 +21,7 @@
#include <omnithread.h>
#include <tango.h>
-#include <Alarm.h>
+#include <AlarmHandler.h>
#define ALARM_THREAD_EXIT "alarm_thread_exit"
#define ALARM_THREAD_EXIT_VALUE -100
@@ -30,13 +30,13 @@
class alarm_thread : public omni_thread {
public:
- alarm_thread(Alarm_ns::Alarm *p);
+ alarm_thread(AlarmHandler_ns::AlarmHandler *p);
~alarm_thread();
//int period;
protected:
void run(void *);
private:
- Alarm_ns::Alarm *p_Alarm;
+ AlarmHandler_ns::AlarmHandler *p_Alarm;
};
#endif /* ALARM_THREAD_H */
diff --git a/src/cmd_thread.h b/src/cmd_thread.h
index 4405122..136ff61 100644
--- a/src/cmd_thread.h
+++ b/src/cmd_thread.h
@@ -42,7 +42,7 @@
#include <omnithread.h>
#include <tango.h>
-#include "Alarm.h"
+#include "AlarmHandler.h"
struct cmd_t
{
diff --git a/src/event_table.cpp b/src/event_table.cpp
index b366be5..e5851a1 100644
--- a/src/event_table.cpp
+++ b/src/event_table.cpp
@@ -16,7 +16,7 @@
#include <sys/time.h>
#include <tango.h>
#include "event_table.h"
-#include "Alarm.h"
+#include "AlarmHandler.h"
//for get_event_system_for_event_id, to know if ZMQ
#include <eventconsumer.h>
@@ -336,7 +336,7 @@ event *event_table::get_signal(string signame)
for (unsigned int i=0 ; i<v_event.size() ; i++)
{
event *sig = &v_event[i];
- if (static_cast<Alarm_ns::Alarm *>(mydev)->compare_without_domain(sig->name,signame))
+ if (static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_without_domain(sig->name,signame))
return sig;
}
return NULL;
@@ -360,10 +360,10 @@ void event_table::stop(string &signame)
if(!v_event[i].stopped)
{
v_event[i].stopped=true;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read++;
if(v_event[i].running)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read--;
try
{
remove(signame, true);
@@ -376,7 +376,7 @@ void event_table::stop(string &signame)
}
if(v_event[i].paused)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
try
{
remove(signame, true);
@@ -397,19 +397,19 @@ void event_table::stop(string &signame)
for (unsigned int i=0 ; i<v_event.size() ; i++)
{
#ifndef _MULTI_TANGO_HOST
- if (static_cast<Alarm_ns::Alarm *>(mydev)->compare_without_domain(v_event[i].name,signame))
+ if (static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_without_domain(v_event[i].name,signame))
#else
- if (!static_cast<Alarm_ns::Alarm *>(mydev)->compare_tango_names(v_event[i].name,signame))
+ if (!static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_tango_names(v_event[i].name,signame))
#endif
{
v_event[i].siglock->writerIn();
if(!v_event[i].stopped)
{
v_event[i].stopped=true;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read++;
if(v_event[i].running)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read--;
try
{
remove(signame, true);
@@ -422,7 +422,7 @@ void event_table::stop(string &signame)
}
if(v_event[i].paused)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
try
{
remove(signame, true);
@@ -525,12 +525,12 @@ void event_table::remove(string &signame, bool stop)
if(!stop)
{
if(sig->running)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read--;
if(sig->paused)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
if(sig->stopped)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read--;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeNumber_read--;
delete sig->siglock;
v_event.erase(pos);
DEBUG_STREAM <<"event_table::"<< __func__<<": removed " << signame << endl;
@@ -545,9 +545,9 @@ void event_table::remove(string &signame, bool stop)
{
event *sig = &v_event[i];
#ifndef _MULTI_TANGO_HOST
- if (static_cast<Alarm_ns::Alarm *>(mydev)->compare_without_domain(sig->name,signame))
+ if (static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_without_domain(sig->name,signame))
#else
- if (!static_cast<Alarm_ns::Alarm *>(mydev)->compare_tango_names(sig->name,signame))
+ if (!static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_tango_names(sig->name,signame))
#endif
{
found = true;
@@ -576,12 +576,12 @@ void event_table::remove(string &signame, bool stop)
if(!stop)
{
if(sig->running)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read--;
if(sig->paused)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
if(sig->stopped)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read--;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeNumber_read--;
delete sig->siglock;
v_event.erase(pos);
DEBUG_STREAM <<"event_table::"<< __func__<<": removed " << signame << endl;
@@ -709,7 +709,7 @@ void event_table::add(string &signame, vector<string> contexts, int to_do, bool
for (unsigned int i=0 ; i<v_event.size() && !found ; i++)
{
sig = &v_event[i];
- found = static_cast<Alarm_ns::Alarm *>(mydev)->compare_without_domain(sig->name,signame);
+ found = static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_without_domain(sig->name,signame);
}
veclock.readerOut();
//DEBUG_STREAM << "event_table::"<<__func__<<": signame="<<signame<<" found="<<(found ? "Y" : "N") << " start="<<(start ? "Y" : "N")<< endl;
@@ -781,8 +781,8 @@ void event_table::add(string &signame, vector<string> contexts, int to_do, bool
// Add in vector
v_event.push_back(*signal);
delete signal;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeNumber_read++;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read++;
veclock.writerOut();
//DEBUG_STREAM << "event_table::"<<__func__<<": signame="<<signame<<" push_back signal"<< endl;
}
@@ -838,7 +838,7 @@ void event_table::subscribe_events()
continue;
}
}
- sig->event_cb = new EventCallBack(static_cast<Alarm_ns::Alarm *>(mydev));
+ sig->event_cb = new EventCallBack(static_cast<AlarmHandler_ns::AlarmHandler *>(mydev));
sig->first = true;
sig->first_err = true;
DEBUG_STREAM << "event_table::"<<__func__<<":Subscribing for " << sig->name << " " << (sig->first ? "FIRST" : "NOT FIRST") << endl;
@@ -910,7 +910,7 @@ void event_table::start(string &signame)
{
if(v_event[i].stopped)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read--;
try
{
add(signame, contexts, NOTHING, true);
@@ -928,8 +928,8 @@ void event_table::start(string &signame)
}
v_event[i].running=true;
if(v_event[i].paused)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read++;
v_event[i].paused=false;
v_event[i].stopped=false;
}
@@ -940,9 +940,9 @@ void event_table::start(string &signame)
for (unsigned int i=0 ; i<v_event.size() ; i++)
{
#ifndef _MULTI_TANGO_HOST
- if (static_cast<Alarm_ns::Alarm *>(mydev)->compare_without_domain(v_event[i].name,signame))
+ if (static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_without_domain(v_event[i].name,signame))
#else
- if (!static_cast<Alarm_ns::Alarm *>(mydev)->compare_tango_names(v_event[i].name,signame))
+ if (!static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->compare_tango_names(v_event[i].name,signame))
#endif
{
v_event[i].siglock->writerIn();
@@ -950,7 +950,7 @@ void event_table::start(string &signame)
{
if(v_event[i].stopped)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read--;
try
{
add(signame, contexts, NOTHING, true);
@@ -968,8 +968,8 @@ void event_table::start(string &signame)
}
v_event[i].running=true;
if(v_event[i].paused)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read++;
v_event[i].paused=false;
v_event[i].stopped=false;
}
@@ -997,7 +997,7 @@ void event_table::start_all()
if(v_event[i].stopped)
{
string signame = v_event[i].name;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStoppedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStoppedNumber_read--;
try
{
add(signame, contexts, NOTHING, true);
@@ -1015,8 +1015,8 @@ void event_table::start_all()
}
v_event[i].running=true;
if(v_event[i].paused)
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributePausedNumber_read--;
- static_cast<Alarm_ns::Alarm *>(mydev)->attr_AttributeStartedNumber_read++;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributePausedNumber_read--;
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->attr_AttributeStartedNumber_read++;
v_event[i].paused=false;
v_event[i].stopped=false;
}
@@ -1073,7 +1073,7 @@ void event_table::put_signal_property()
//ReaderLock lock(veclock);
if (action>NOTHING)
{
- static_cast<Alarm_ns::Alarm *>(mydev)->put_signal_property();
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->put_signal_property();
if(action >= UPDATE_PROP)
action--;
}
@@ -1179,7 +1179,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
e.msg = o.str();
//cerr << o.str() << endl;
}
- static_cast<Alarm_ns::Alarm *>(mydev)->evlist.push_back(e);
+ static_cast<AlarmHandler_ns::AlarmHandler *>(mydev)->evlist.push_back(e);
} /* push_event() */
void EventCallBack::extract_values(Tango::DeviceAttribute *attr_value, vector<double> &val, string &val_string, int &type)
diff --git a/src/main.cpp b/src/main.cpp
index 3a94797..52ab468 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,15 +1,14 @@
-/*----- PROTECTED REGION ID(Alarm::main.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: $";
+/*----- PROTECTED REGION ID(AlarmHandler::main.cpp) ENABLED START -----*/
//=============================================================================
//
// file : main.cpp
//
-// description : C++ source for the Alarm device server main.
+// description : C++ source for the AlarmHandler device server main.
// The main rule is to initialise (and create) the Tango
// system and to create the DServerClass singleton.
// The main should be the same for every Tango device server.
//
-// project : alarm
+// project : Elettra alarm handler device server
//
// This file is part of Tango device class.
//
@@ -26,38 +25,33 @@ static const char *RcsId = "$Id: $";
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
//
-// $Author: $
//
-// $Revision: $
-// $Date: $
-//
-// $HeadURL: $
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
//=============================================================================
-
-
#include <tango.h>
+// Check if crash reporting is used.
+#if defined(ENABLE_CRASH_REPORT)
+# include <crashreporting/crash_report.h>
+#else
+# define DECLARE_CRASH_HANDLER
+# define INSTALL_CRASH_HANDLER
+#endif
+
+DECLARE_CRASH_HANDLER;
int main(int argc,char *argv[])
{
-
- Tango::Util *tg;
+ INSTALL_CRASH_HANDLER
try
{
// Initialise the device server
//----------------------------------------
- tg = Tango::Util::init(argc,argv);
+ Tango::Util *tg = Tango::Util::init(argc,argv);
- /*
- * serialize all calls
- * BY_DEVICE, BY_CLASS, BY_PROCESS
- */
- //tg->set_serial_model(Tango::BY_PROCESS);
-
// Create the device server singleton
// which will create everything
//----------------------------------------
@@ -68,7 +62,7 @@ int main(int argc,char *argv[])
cout << "Ready to accept request" << endl;
tg->server_run();
}
- catch (bad_alloc)
+ catch (bad_alloc &)
{
cout << "Can't allocate memory to store device object !!!" << endl;
cout << "Exiting" << endl;
@@ -80,9 +74,8 @@ int main(int argc,char *argv[])
cout << "Received a CORBA_Exception" << endl;
cout << "Exiting" << endl;
}
- tg->server_cleanup();
+ Tango::Util::instance()->server_cleanup();
return(0);
}
-
-/*----- PROTECTED REGION END -----*/ // Alarm::main.cpp
+/*----- PROTECTED REGION END -----*/ // AlarmHandler::main.cpp
diff --git a/src/update-thread.cpp b/src/update-thread.cpp
index 313913e..6064f4f 100644
--- a/src/update-thread.cpp
+++ b/src/update-thread.cpp
@@ -26,7 +26,7 @@ static const char __FILE__rev[] = __FILE__ " $Revision: 1.2 $";
/*
* alarm_thread::alarm_thread()
*/
-update_thread::update_thread(Alarm_ns::Alarm *p) : p_Alarm(p)
+update_thread::update_thread(AlarmHandler_ns::AlarmHandler *p) : p_Alarm(p)
{
//cout << __FILE__rev << endl;
}
diff --git a/src/update-thread.h b/src/update-thread.h
index ebf7102..ef97c4f 100644
--- a/src/update-thread.h
+++ b/src/update-thread.h
@@ -22,16 +22,16 @@
#include <omnithread.h>
#include <tango.h>
-#include <Alarm.h>
+#include <AlarmHandler.h>
class update_thread : public omni_thread {
public:
- update_thread(Alarm_ns::Alarm *p);
+ update_thread(AlarmHandler_ns::AlarmHandler *p);
~update_thread();
protected:
void run(void *);
private:
- Alarm_ns::Alarm *p_Alarm;
+ AlarmHandler_ns::AlarmHandler *p_Alarm;
};
#endif /* UPDATE_THREAD_H */
--
GitLab