Skip to content
Snippets Groups Projects
Commit 09fe1cb7 authored by Marco De Marco's avatar Marco De Marco
Browse files

Minor changes and interrupt all commented

parent 544d5c86
No related branches found
No related tags found
No related merge requests found
...@@ -481,7 +481,7 @@ void DataExporter::get_device_property() ...@@ -481,7 +481,7 @@ void DataExporter::get_device_property()
//-------------------------------------------------------- //--------------------------------------------------------
void DataExporter::always_executed_hook() void DataExporter::always_executed_hook()
{ {
INFO_STREAM << "DataExporter::always_executed_hook() " << device_name << endl; DEBUG_STREAM << "DataExporter::always_executed_hook() " << device_name << endl;
/*----- PROTECTED REGION ID(DataExporter::always_executed_hook) ENABLED START -----*/ /*----- PROTECTED REGION ID(DataExporter::always_executed_hook) ENABLED START -----*/
if(get_state() != Tango::FAULT) if(get_state() != Tango::FAULT)
......
...@@ -136,10 +136,10 @@ ...@@ -136,10 +136,10 @@
<states name="OFF" description="Data exporter is in OFF state (not ready for incoming connections)"> <states name="OFF" description="Data exporter is in OFF state (not ready for incoming connections)">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states> </states>
<states name="FAULT" description="Data exporter is in FAULT state (not ready to propagate data)"> <states name="FAULT" description="Data exporter is in FAULT state (configuration error)">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states> </states>
<states name="ALARM" description="Data exporter is in ALARM state (not ready to propagate data)"> <states name="ALARM" description="Data exporter is in ALARM state (runtime error)">
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</states> </states>
<preferences docHome="./doc_html" makefileHome="/usr/local/tango-8.1.2/share/pogo/preferences"/> <preferences docHome="./doc_html" makefileHome="/usr/local/tango-8.1.2/share/pogo/preferences"/>
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
//================================================================ //================================================================
// ON | Data exporter is in ON state (ready to incoming connections) // ON | Data exporter is in ON state (ready to incoming connections)
// OFF | Data exporter is in OFF state (not ready for incoming connections) // OFF | Data exporter is in OFF state (not ready for incoming connections)
// FAULT | Data exporter is in FAULT state (not ready to propagate data) // FAULT | Data exporter is in FAULT state (configuration error)
// ALARM | Data exporter is in ALARM state (not ready to propagate data) // ALARM | Data exporter is in ALARM state (runtime error)
namespace DataExporter_ns namespace DataExporter_ns
......
...@@ -30,7 +30,7 @@ Server::Server(Tango::DeviceImpl* deviceImpl_p, Configuration::SP configuration_ ...@@ -30,7 +30,7 @@ Server::Server(Tango::DeviceImpl* deviceImpl_p, Configuration::SP configuration_
} }
//============================================================================== //==============================================================================
// Server::Server() // Server::~Server()
//============================================================================== //==============================================================================
Server::~Server() Server::~Server()
{ {
...@@ -45,11 +45,13 @@ Server::~Server() ...@@ -45,11 +45,13 @@ Server::~Server()
if(m_threadGroup_sp) if(m_threadGroup_sp)
{ {
m_threadGroup_sp->interrupt_all(); //m_threadGroup_sp->interrupt_all();
m_threadGroup_sp->join_all(); m_threadGroup_sp->join_all();
} }
DEBUG_STREAM << "Server::~Server() END" << endl;
google::protobuf::ShutdownProtobufLibrary(); google::protobuf::ShutdownProtobufLibrary();
} }
...@@ -119,7 +121,7 @@ void Server::stop() throw(std::runtime_error) ...@@ -119,7 +121,7 @@ void Server::stop() throw(std::runtime_error)
if(m_threadGroup_sp) if(m_threadGroup_sp)
{ {
m_threadGroup_sp->interrupt_all(); //m_threadGroup_sp->interrupt_all();
m_threadGroup_sp->join_all(); m_threadGroup_sp->join_all();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment