Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
data_exporter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IA2
data_exporter
Commits
09fe1cb7
Commit
09fe1cb7
authored
11 years ago
by
Marco De Marco
Browse files
Options
Downloads
Patches
Plain Diff
Minor changes and interrupt all commented
parent
544d5c86
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/DataExporter.cpp
+1
-1
1 addition, 1 deletion
src/DataExporter.cpp
src/DataExporter.xmi
+2
-2
2 additions, 2 deletions
src/DataExporter.xmi
src/DataExporterStateMachine.cpp
+2
-2
2 additions, 2 deletions
src/DataExporterStateMachine.cpp
src/Server.cpp
+6
-4
6 additions, 4 deletions
src/Server.cpp
with
11 additions
and
9 deletions
src/DataExporter.cpp
+
1
−
1
View file @
09fe1cb7
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
src/DataExporter.xmi
+
2
−
2
View file @
09fe1cb7
...
@@ -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"
/>
...
...
This diff is collapsed.
Click to expand it.
src/DataExporterStateMachine.cpp
+
2
−
2
View file @
09fe1cb7
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/Server.cpp
+
6
−
4
View file @
09fe1cb7
...
@@ -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
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment