Removed internal (event-)ID stuff (no need for ID's ATM).

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1445 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-07-11 11:46:11 +00:00
parent 0fbe3d7cfd
commit e4a60e8408
6 changed files with 9 additions and 43 deletions

View File

@ -6,16 +6,16 @@ namespace fail {
// External reference declared in SALInst.hpp
ConcreteSimulatorController simulator;
event_id_t SimulatorController::addEvent(BaseEvent* ev)
bool SimulatorController::addEvent(BaseEvent* ev)
{
assert(ev != NULL && "FATAL ERROR: Argument (ptr) cannot be NULL!");
event_id_t ret = m_EvList.add(ev, m_Flows.getCurrent());
m_EvList.add(ev, m_Flows.getCurrent());
// Call the common postprocessing function:
if (!ev->onEventAddition()) { // If the return value signals "false"...,
m_EvList.remove(ev); // ...skip the addition
ret = INVALID_EVENT;
return false;
}
return ret;
return true;
}
BaseEvent* SimulatorController::waitAny(void)