ecos: no need for clearListeners anymore
Since r1700, listeners remove themselves when they leave their scope. A restore() call also implicitly clears all listeners. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1912 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
@ -90,8 +90,6 @@ bool EcosKernelTestExperiment::retrieveGuestAddresses(guest_address_t addr_finis
|
|||||||
mm.flush();
|
mm.flush();
|
||||||
mm.close();
|
mm.close();
|
||||||
|
|
||||||
// clean up simulator
|
|
||||||
simulator.clearListeners();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,8 +116,6 @@ bool EcosKernelTestExperiment::establishState(guest_address_t addr_entry, guest_
|
|||||||
assert(bp.getTriggerInstructionPointer() == addr_entry);
|
assert(bp.getTriggerInstructionPointer() == addr_entry);
|
||||||
assert(simulator.getRegisterManager().getInstructionPointer() == addr_entry);
|
assert(simulator.getRegisterManager().getInstructionPointer() == addr_entry);
|
||||||
|
|
||||||
// clean up simulator
|
|
||||||
simulator.clearListeners();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -222,14 +218,11 @@ bool EcosKernelTestExperiment::performTrace(guest_address_t addr_entry, guest_ad
|
|||||||
// serialize trace to file
|
// serialize trace to file
|
||||||
if (of.fail()) {
|
if (of.fail()) {
|
||||||
log << "failed to write " << tracefile << endl;
|
log << "failed to write " << tracefile << endl;
|
||||||
simulator.clearListeners(this);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
of.close();
|
of.close();
|
||||||
log << "trace written to " << tracefile << endl;
|
log << "trace written to " << tracefile << endl;
|
||||||
|
|
||||||
// clean up simulator
|
|
||||||
simulator.clearListeners();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,7 +333,6 @@ bool EcosKernelTestExperiment::faultInjection() {
|
|||||||
result->set_latest_ip(injection_ip);
|
result->set_latest_ip(injection_ip);
|
||||||
result->set_details(ss.str());
|
result->set_details(ss.str());
|
||||||
|
|
||||||
simulator.clearListeners();
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user