christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Listener objects will now be removed when their scope ends.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1700 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-09-27 09:59:20 +00:00
parent 2c1c3e8f02
commit b07fa4dcb7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/sal/Listener.cc
View File

@ -3,6 +3,11 @@
namespace fail { namespace fail {
BaseListener::~BaseListener()
{
simulator.removeListener(this);
}
bool TroubleListener::isMatching(const TroubleEvent* pEv) const bool TroubleListener::isMatching(const TroubleEvent* pEv) const
{ {
for (unsigned i = 0; i < m_WatchNumbers.size(); i++) { for (unsigned i = 0; i < m_WatchNumbers.size(); i++) {

2
src/core/sal/Listener.hpp
View File

@ -30,7 +30,7 @@ public:
BaseListener() BaseListener()
: m_OccCounter(1), m_OccCounterInit(1), m_Parent(NULL), m_Loc(INVALID_INDEX), m_Home(NULL) : m_OccCounter(1), m_OccCounterInit(1), m_Parent(NULL), m_Loc(INVALID_INDEX), m_Home(NULL)
{ } { }
virtual ~BaseListener() { } // FIXME remove from queues virtual ~BaseListener();
/** /**
* This method is called when an experiment flow adds a new listener by * This method is called when an experiment flow adds a new listener by
* calling \c simulator.addListener() or \c simulator.addListenerAndResume(). * calling \c simulator.addListener() or \c simulator.addListenerAndResume().