Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pre_processor
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IA2
pre_processor
Commits
42d91ec0
Commit
42d91ec0
authored
11 years ago
by
Marco De Marco
Browse files
Options
Downloads
Patches
Plain Diff
Counters readed without mutex lock fix
parent
230b949a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/PreProcessor.cpp
+12
-3
12 additions, 3 deletions
src/PreProcessor.cpp
with
12 additions
and
3 deletions
src/PreProcessor.cpp
+
12
−
3
View file @
42d91ec0
...
@@ -436,6 +436,9 @@ void PreProcessor::read_RegularFileCounter(Tango::Attribute &attr)
...
@@ -436,6 +436,9 @@ void PreProcessor::read_RegularFileCounter(Tango::Attribute &attr)
DEBUG_STREAM
<<
"PreProcessor::read_RegularFileCounter(Tango::Attribute &attr) entering... "
<<
endl
;
DEBUG_STREAM
<<
"PreProcessor::read_RegularFileCounter(Tango::Attribute &attr) entering... "
<<
endl
;
/*----- PROTECTED REGION ID(PreProcessor::read_RegularFileCounter) ENABLED START -----*/
/*----- PROTECTED REGION ID(PreProcessor::read_RegularFileCounter) ENABLED START -----*/
// Set the attribute value
// Set the attribute value
boost
::
mutex
::
scoped_lock
regularCounterLock
(
m_regularCounterMutex
);
attr
.
set_value
(
attr_RegularFileCounter_read
);
attr
.
set_value
(
attr_RegularFileCounter_read
);
/*----- PROTECTED REGION END -----*/
// PreProcessor::read_RegularFileCounter
/*----- PROTECTED REGION END -----*/
// PreProcessor::read_RegularFileCounter
...
@@ -454,6 +457,9 @@ void PreProcessor::read_WarningFileCounter(Tango::Attribute &attr)
...
@@ -454,6 +457,9 @@ void PreProcessor::read_WarningFileCounter(Tango::Attribute &attr)
DEBUG_STREAM
<<
"PreProcessor::read_WarningFileCounter(Tango::Attribute &attr) entering... "
<<
endl
;
DEBUG_STREAM
<<
"PreProcessor::read_WarningFileCounter(Tango::Attribute &attr) entering... "
<<
endl
;
/*----- PROTECTED REGION ID(PreProcessor::read_WarningFileCounter) ENABLED START -----*/
/*----- PROTECTED REGION ID(PreProcessor::read_WarningFileCounter) ENABLED START -----*/
// Set the attribute value
// Set the attribute value
boost
::
mutex
::
scoped_lock
warningCounterLock
(
m_warningCounterMutex
);
attr
.
set_value
(
attr_WarningFileCounter_read
);
attr
.
set_value
(
attr_WarningFileCounter_read
);
/*----- PROTECTED REGION END -----*/
// PreProcessor::read_WarningFileCounter
/*----- PROTECTED REGION END -----*/
// PreProcessor::read_WarningFileCounter
...
@@ -472,6 +478,9 @@ void PreProcessor::read_ErrorFileCounter(Tango::Attribute &attr)
...
@@ -472,6 +478,9 @@ void PreProcessor::read_ErrorFileCounter(Tango::Attribute &attr)
DEBUG_STREAM
<<
"PreProcessor::read_ErrorFileCounter(Tango::Attribute &attr) entering... "
<<
endl
;
DEBUG_STREAM
<<
"PreProcessor::read_ErrorFileCounter(Tango::Attribute &attr) entering... "
<<
endl
;
/*----- PROTECTED REGION ID(PreProcessor::read_ErrorFileCounter) ENABLED START -----*/
/*----- PROTECTED REGION ID(PreProcessor::read_ErrorFileCounter) ENABLED START -----*/
// Set the attribute value
// Set the attribute value
boost
::
mutex
::
scoped_lock
errorCounterLock
(
m_errorCounterMutex
);
attr
.
set_value
(
attr_ErrorFileCounter_read
);
attr
.
set_value
(
attr_ErrorFileCounter_read
);
/*----- PROTECTED REGION END -----*/
// PreProcessor::read_ErrorFileCounter
/*----- PROTECTED REGION END -----*/
// PreProcessor::read_ErrorFileCounter
...
@@ -592,7 +601,7 @@ void PreProcessor::reset_counter()
...
@@ -592,7 +601,7 @@ void PreProcessor::reset_counter()
//==============================================================================
//==============================================================================
void
PreProcessor
::
incrementRegularCounter
()
void
PreProcessor
::
incrementRegularCounter
()
{
{
DEBUG_STREAM
<<
"
FitsImporte
r::incrementRegularCounter() - "
<<
device_name
<<
endl
;
DEBUG_STREAM
<<
"
PreProcesso
r::incrementRegularCounter() - "
<<
device_name
<<
endl
;
boost
::
mutex
::
scoped_lock
regularCounterLock
(
m_regularCounterMutex
);
boost
::
mutex
::
scoped_lock
regularCounterLock
(
m_regularCounterMutex
);
...
@@ -604,7 +613,7 @@ void PreProcessor::incrementRegularCounter()
...
@@ -604,7 +613,7 @@ void PreProcessor::incrementRegularCounter()
//==============================================================================
//==============================================================================
void
PreProcessor
::
incrementWarningCounter
()
void
PreProcessor
::
incrementWarningCounter
()
{
{
DEBUG_STREAM
<<
"
FitsImporte
r::incrementWarningCounter() - "
<<
device_name
<<
endl
;
DEBUG_STREAM
<<
"
PreProcesso
r::incrementWarningCounter() - "
<<
device_name
<<
endl
;
boost
::
mutex
::
scoped_lock
warningCounterLock
(
m_warningCounterMutex
);
boost
::
mutex
::
scoped_lock
warningCounterLock
(
m_warningCounterMutex
);
...
@@ -616,7 +625,7 @@ void PreProcessor::incrementWarningCounter()
...
@@ -616,7 +625,7 @@ void PreProcessor::incrementWarningCounter()
//==============================================================================
//==============================================================================
void
PreProcessor
::
incrementErrorCounter
()
void
PreProcessor
::
incrementErrorCounter
()
{
{
DEBUG_STREAM
<<
"
FitsImporte
r::incrementErrorCounter() - "
<<
device_name
<<
endl
;
DEBUG_STREAM
<<
"
PreProcesso
r::incrementErrorCounter() - "
<<
device_name
<<
endl
;
boost
::
mutex
::
scoped_lock
errorCounterLock
(
m_errorCounterMutex
);
boost
::
mutex
::
scoped_lock
errorCounterLock
(
m_errorCounterMutex
);
...
...
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