From bda1b879522a43b329071990a018622e7b36a3ea Mon Sep 17 00:00:00 2001 From: Roland Jax Date: Sun, 28 Sep 2014 21:23:12 +0200 Subject: [PATCH] class CYCData: methode delCommands added. --- src/cycdata.cpp | 18 ++++++------------ src/cycdata.h | 7 +++++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/cycdata.cpp b/src/cycdata.cpp index 06918466..43e40039 100644 --- a/src/cycdata.cpp +++ b/src/cycdata.cpp @@ -24,18 +24,6 @@ extern LogInstance& L; -CYCData::CYCData(EBusLoop* ebusloop, Commands* commands) - : m_ebusloop(ebusloop), m_commands(commands), m_stop(false) -{ - addCommands(m_commands); -} - -CYCData::~CYCData() -{ - for (mapCI_t iter = m_cycDB.begin(); iter != m_cycDB.end(); ++iter) - delete iter->second; -} - void* CYCData::run() { bool skipfirst = false; @@ -145,3 +133,9 @@ void CYCData::addCommands(Commands* commands) L.log(cyc, trace, "%d cycle commands added", m_cycDB.size()); } +void CYCData::delCommands() +{ + for (mapCI_t iter = m_cycDB.begin(); iter != m_cycDB.end(); ++iter) + delete iter->second; +} + diff --git a/src/cycdata.h b/src/cycdata.h index 949a3d33..aac4132a 100644 --- a/src/cycdata.h +++ b/src/cycdata.h @@ -35,8 +35,10 @@ class CYCData : public Thread { public: - CYCData(EBusLoop* ebusloop, Commands* commands); - ~CYCData(); + CYCData(EBusLoop* ebusloop, Commands* commands) + : m_ebusloop(ebusloop), m_commands(commands), m_stop(false) + { addCommands(m_commands); } + ~CYCData() { delCommands(); } void* run(); void stop() { m_stop = true; } @@ -44,6 +46,7 @@ public: std::string getData(int index); void addCommands(Commands* commands); + void delCommands(); private: EBusLoop* m_ebusloop;