christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

wmoo: TimerEvent constructor fix.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1367 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-06-21 11:04:16 +00:00
parent ad0cfb9b11
commit e586f9d844
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/experiments/weather-monitor/experiment.cc
View File

@ -14,6 +14,7 @@
#include "sal/SALInst.hpp" #include "sal/SALInst.hpp"
#include "sal/Memory.hpp" #include "sal/Memory.hpp"
#include "sal/bochs/BochsRegister.hpp" #include "sal/bochs/BochsRegister.hpp"
#include "sal/bochs/BochsEvents.hpp"
#include "sal/Event.hpp" #include "sal/Event.hpp"
// you need to have the tracing plugin enabled for this // you need to have the tracing plugin enabled for this
@ -261,7 +262,7 @@ bool WeatherMonitorExperiment::run()
simulator.addEvent(&ev_detected); simulator.addEvent(&ev_detected);
// timeout (e.g., stuck in a HLT instruction) // timeout (e.g., stuck in a HLT instruction)
// 10000us = 500000 instructions // 10000us = 500000 instructions
TimerEvent ev_timeout(10000, true); TimerEvent ev_timeout(10000);
simulator.addEvent(&ev_timeout); simulator.addEvent(&ev_timeout);
#if LOCAL && 0 #if LOCAL && 0
@ -316,9 +317,6 @@ bool WeatherMonitorExperiment::run()
ss << "eventid " << ev->getId() << " EIP " << simulator.getRegisterManager().getInstructionPointer(); ss << "eventid " << ev->getId() << " EIP " << simulator.getRegisterManager().getInstructionPointer();
result->set_details(ss.str()); result->set_details(ss.str());
} }
// explicitly remove all events before we leave their scope
// FIXME event destructors should remove them from the queues
simulator.clearEvents();
} }
// sanity check: do we have exactly 8 results? // sanity check: do we have exactly 8 results?
if (param.msg.result_size() != 8) { if (param.msg.result_size() != 8) {