From 515e1684054de7c56338d37de3460e434d2cd1f8 Mon Sep 17 00:00:00 2001
From: Sonia Minolli <sonia.minolli@synchrotron-soleil.fr>
Date: Wed, 9 Dec 2015 16:45:48 +0000
Subject: [PATCH] Created tag release_1_6_1.
---
pom.xml | 3 ++-
src/BufferedCounterPeriod.h | 2 +-
src/NI6602_Interface.cpp | 12 ++++++------
src/NexusManager.cpp | 3 +++
src/PulseCountingManager.cpp | 12 ++++++++++++
5 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index f4f2bdc..23313fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>PulseCounting-${aol}-${mode}</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>1.6.1</version>
<packaging>nar</packaging>
<name>PulseCounting</name>
@@ -43,6 +43,7 @@
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>NI660Xsl-${aol}-${library}-${mode}</artifactId>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
diff --git a/src/BufferedCounterPeriod.h b/src/BufferedCounterPeriod.h
index 2056efa..cebf30e 100644
--- a/src/BufferedCounterPeriod.h
+++ b/src/BufferedCounterPeriod.h
@@ -184,7 +184,7 @@ protected:
bool m_cntTimedout;
// Storage error flag
- bool m_storageError; // soso crash rock
+ bool m_storageError;
// storage manager
NexusManager * m_storage_mgr;
diff --git a/src/NI6602_Interface.cpp b/src/NI6602_Interface.cpp
index 07437f5..929ec9d 100644
--- a/src/NI6602_Interface.cpp
+++ b/src/NI6602_Interface.cpp
@@ -1463,7 +1463,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
bool l_overrun = false;
bool l_timedout = false;
- bool l_storageErr = false; // soso crash rock
+ bool l_storageErr = false;
switch (m_acq_mode)
@@ -1563,7 +1563,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
// get buffering errors (overrun, timeout or storage error)
l_overrun = m_buffer_pos_ct_list[p_cfg.name]->isOverrun();
l_timedout = m_buffer_pos_ct_list[p_cfg.name]->isTimedout();
- l_storageErr = m_buffer_pos_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+ l_storageErr = m_buffer_pos_ct_list[p_cfg.name]->isStorageKO();
}
else
{
@@ -1587,7 +1587,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
// get buffering errors (overrun, timeout or storage error)
l_overrun = m_buffer_evt_ct_list[p_cfg.name]->isOverrun();
l_timedout = m_buffer_evt_ct_list[p_cfg.name]->isTimedout();
- l_storageErr = m_buffer_evt_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+ l_storageErr = m_buffer_evt_ct_list[p_cfg.name]->isStorageKO();
}
else
{
@@ -1610,7 +1610,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
// get buffering errors (overrun, timeout or storage error)
l_overrun = m_buffer_dt_ct_list[p_cfg.name]->isOverrun();
l_timedout = m_buffer_dt_ct_list[p_cfg.name]->isTimedout();
- l_storageErr = m_buffer_dt_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+ l_storageErr = m_buffer_dt_ct_list[p_cfg.name]->isStorageKO();
}
else
{
@@ -1633,7 +1633,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
// get buffering errors (overrun, timeout or storage error)
l_overrun = m_buffer_prd_ct_list[p_cfg.name]->isOverrun();
l_timedout = m_buffer_prd_ct_list[p_cfg.name]->isTimedout();
- l_storageErr = m_buffer_prd_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+ l_storageErr = m_buffer_prd_ct_list[p_cfg.name]->isStorageKO();
}
else
{
@@ -1685,7 +1685,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
if (l_timedout)
l_val = Tango::DISABLE;
- if (l_storageErr) // soso crash rock
+ if (l_storageErr)
l_val = Tango::FAULT;
return l_val;
diff --git a/src/NexusManager.cpp b/src/NexusManager.cpp
index f57a1f7..0f14acb 100644
--- a/src/NexusManager.cpp
+++ b/src/NexusManager.cpp
@@ -80,6 +80,9 @@ NexusManager::~NexusManager ()
{
if (this->m_NexusDataStreamerFinalizer)
this->m_NexusDataStreamerFinalizer->stop();
+
+ delete m_NexusDataStreamerFinalizer;
+ m_NexusDataStreamerFinalizer = NULL;
}
catch (...)
{
diff --git a/src/PulseCountingManager.cpp b/src/PulseCountingManager.cpp
index 29e9bf0..b8554dc 100644
--- a/src/PulseCountingManager.cpp
+++ b/src/PulseCountingManager.cpp
@@ -125,6 +125,18 @@ PulseCountingManager::~PulseCountingManager ()
l_it->second = NULL;
}
}
+
+ if (m_nexus_manager)
+ {
+ delete m_nexus_manager;
+ m_nexus_manager = NULL;
+ }
+
+ if (m_dyn_attr_manager)
+ {
+ delete m_dyn_attr_manager;
+ m_dyn_attr_manager = NULL;
+ }
}
// ============================================================================
--
GitLab