Fixed Listeners

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1595 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hoffmann
2012-09-06 08:16:54 +00:00
parent 036aa95d4f
commit a9b78c1154

View File

@ -45,7 +45,7 @@ bool VEZSExperiment::run()
simulator.terminate(); simulator.terminate();
//simulator.save("vezs.state"); //simulator.save("vezs.state");
#endif #endif
#if 0 #if 1
int bit_offset = 2; int bit_offset = 2;
for (int instr_offset = 0; instr_offset < OOSTUBS_NUMINSTR; ++instr_offset) { for (int instr_offset = 0; instr_offset < OOSTUBS_NUMINSTR; ++instr_offset) {
@ -96,9 +96,9 @@ bool VEZSExperiment::run()
simulator.addEvent(&ev_timeout); simulator.addEvent(&ev_timeout);
// remaining instructions until "normal" ending // remaining instructions until "normal" ending
BPSingleEvent ev_end(ANY_ADDR); BPSingleListener ev_end(ANY_ADDR);
ev_end.setCounter(OOSTUBS_NUMINSTR - instr_offset); ev_end.setCounter(OOSTUBS_NUMINSTR - instr_offset);
simulator.addEvent(&ev_end); simulator.addListener(&ev_end);
// Start simulator and wait for any result // Start simulator and wait for any result
BaseEvent* ev = simulator.waitAny(); BaseEvent* ev = simulator.waitAny();
@ -121,7 +121,7 @@ bool VEZSExperiment::run()
log << "@ ip 0x" << hex << injection_ip << endl; log << "@ ip 0x" << hex << injection_ip << endl;
// explicitly remove all events before we leave their scope // explicitly remove all events before we leave their scope
// FIXME event destructors should remove them from the queues // FIXME event destructors should remove them from the queues
simulator.clearEvents(); simulator.clearListeners();
} }
#endif #endif