christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

bugfix: properly remove remaining events of terminating experiment

Browse Source 
Before this commit, EventList::getEventsOf() broke when *two* experiment
flows terminated in direct succession: (*it)->getParent() fails if the
underlying event doesn't exist anymore.

To fix this, I moved the event removal from SimulatorController to
EventList::remove(flow), and made it work on the internal event list
magic similarly to EventList::remove(event).

And I tested it with a few known-working experiments.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1022 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-04-03 14:05:24 +00:00
parent ccc8d4e4c5
commit f3855293ca
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/SAL/SimulatorController.cc
View File

@ -210,15 +210,6 @@ void SimulatorController::onJumpEvent(bool flagTriggered, unsigned opcode)
m_EvList.fireActiveEvents();
}
void SimulatorController::cleanup(fi::ExperimentFlow* pExp)
{
// remove related events:
std::vector<fi::BaseEvent*> evlist;
m_EvList.getEventsOf(pExp, evlist);
for(size_t i = 0; i < evlist.size(); i++)
m_EvList.remove(evlist[i]);
}
void SimulatorController::addFlow(fi::ExperimentFlow* flow)
{
// Store the (flow,corohandle)-tuple internally and create its coroutine:
@ -230,7 +221,7 @@ void SimulatorController::addFlow(fi::ExperimentFlow* flow)
void SimulatorController::removeFlow(fi::ExperimentFlow* flow)
{
// remove all remaining events of this flow
cleanup(flow);
clearEvents(flow);
// remove coroutine
m_Flows.remove(flow);
}

12
core/SAL/SimulatorController.hpp
View File

@ -214,10 +214,10 @@ class SimulatorController
*/
void removeEvent(fi::BaseEvent* ev) { m_EvList.remove(ev); }
/**
* Removes all previously added events for all experiments. This is
* equal to removeEvent(NULL);
* Removes all previously added events for all experiments. To
* restrict this to a specific experiment flow, pass a pointer to it.
*/
void clearEvents() { removeEvent(NULL); }
void clearEvents(fi::ExperimentFlow *flow = 0) { m_EvList.remove(flow); }
/**
* Waits on any events which have been added to the event management. If
* one of those events occour, waitAny() will return the id of that
@ -233,12 +233,6 @@ class SimulatorController
* this pointer will be equal to ev)
*/
fi::BaseEvent* addEventAndWait(fi::BaseEvent* ev);
/**
* Removes all residual events associated with the specified experiment
* flow \a pExp.
* @param pExp the experiment whose events should be removed
*/
void cleanup(fi::ExperimentFlow* pExp);
/**
* Fetches data for the experiments from the Job-Server.
* @return the Experiment-Data from the Job-Server.