From e586f9d8446a3c3afb29c6ce3a941c4300ed59de Mon Sep 17 00:00:00 2001 From: adrian Date: Thu, 21 Jun 2012 11:04:16 +0000 Subject: [PATCH] wmoo: TimerEvent constructor fix. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1367 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- src/experiments/weather-monitor/experiment.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/experiments/weather-monitor/experiment.cc b/src/experiments/weather-monitor/experiment.cc index e0046586..10d34baf 100644 --- a/src/experiments/weather-monitor/experiment.cc +++ b/src/experiments/weather-monitor/experiment.cc @@ -14,6 +14,7 @@ #include "sal/SALInst.hpp" #include "sal/Memory.hpp" #include "sal/bochs/BochsRegister.hpp" +#include "sal/bochs/BochsEvents.hpp" #include "sal/Event.hpp" // you need to have the tracing plugin enabled for this @@ -261,7 +262,7 @@ bool WeatherMonitorExperiment::run() simulator.addEvent(&ev_detected); // timeout (e.g., stuck in a HLT instruction) // 10000us = 500000 instructions - TimerEvent ev_timeout(10000, true); + TimerEvent ev_timeout(10000); simulator.addEvent(&ev_timeout); #if LOCAL && 0 @@ -316,9 +317,6 @@ bool WeatherMonitorExperiment::run() ss << "eventid " << ev->getId() << " EIP " << simulator.getRegisterManager().getInstructionPointer(); 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? if (param.msg.result_size() != 8) {