christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

perf: call onDeletion in the right places

Browse Source 
Change-Id: I920aacec475d8ec3f51e11bcb59f37b84a730ee7
This commit is contained in:
Horst Schirmeier
2020-09-09 20:13:25 +02:00
parent 28cf14cf00
commit c5d7b19752
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ void ListenerManager::remove(ExperimentFlow* flow)
// ... need to be pushed into m_DeleteList, as we're currently // ... need to be pushed into m_DeleteList, as we're currently
// iterating over m_FireList in triggerActiveListeners() and cannot modify it // iterating over m_FireList in triggerActiveListeners() and cannot modify it
if (flow == 0 || (*it)->getParent() == flow) { if (flow == 0 || (*it)->getParent() == flow) {
(*it)->onDeletion(); // Note: onDeletion was previously called within makeActive()
m_DeleteList.push_back(*it); m_DeleteList.push_back(*it);
} }
} }
@ -209,6 +209,9 @@ void ListenerManager::makeActive(BaseListener* pLi)
if (pLi->getCounter() > 0) if (pLi->getCounter() > 0)
return; return;
pLi->resetCounter(); pLi->resetCounter();
pLi->onDeletion();
// Remove the index of the listener from the performance buffer-list: // Remove the index of the listener from the performance buffer-list:
pLi->getPerformanceBuffer()->remove(pLi->getLocation()); pLi->getPerformanceBuffer()->remove(pLi->getLocation());
// Move the listener object from the buffer-list to the fire-list: // Move the listener object from the buffer-list to the fire-list: