christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

weather-monitor: changes due to new Fail architecure

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2021 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2013-01-24 13:26:26 +00:00
parent 58c5ef98f4
commit 55f5d6a051
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,13 +55,13 @@ bool WeatherMonitorExperiment::run()
log << "EIP = " << hex << bp.getTriggerInstructionPointer() << endl; log << "EIP = " << hex << bp.getTriggerInstructionPointer() << endl;
simulator.save(statename); simulator.save(statename);
assert(bp.getTriggerInstructionPointer() == WEATHER_FUNC_MAIN); assert(bp.getTriggerInstructionPointer() == WEATHER_FUNC_MAIN);
assert(simulator.getRegisterManager().getInstructionPointer() == WEATHER_FUNC_MAIN); assert(simulator.getCPU(0).getInstructionPointer() == WEATHER_FUNC_MAIN);
// STEP 2: record trace for fault-space pruning // STEP 2: record trace for fault-space pruning
log << "restoring state" << endl; log << "restoring state" << endl;
simulator.restore(statename); simulator.restore(statename);
log << "EIP = " << hex << simulator.getRegisterManager().getInstructionPointer() << endl; log << "EIP = " << hex << simulator.getCPU(0).getInstructionPointer() << endl;
assert(simulator.getRegisterManager().getInstructionPointer() == WEATHER_FUNC_MAIN); assert(simulator.getCPU(0).getInstructionPointer() == WEATHER_FUNC_MAIN);
log << "enabling tracing" << endl; log << "enabling tracing" << endl;
TracingPlugin tp; TracingPlugin tp;
@ -215,7 +215,7 @@ bool WeatherMonitorExperiment::run()
byte_t newdata = data ^ (1 << bit_offset); byte_t newdata = data ^ (1 << bit_offset);
mm.setByte(mem_addr, newdata); mm.setByte(mem_addr, newdata);
// note at what IP we did it // note at what IP we did it
int32_t injection_ip = simulator.getRegisterManager().getInstructionPointer(); int32_t injection_ip = simulator.getCPU(0).getInstructionPointer();
param.msg.set_injection_ip(injection_ip); param.msg.set_injection_ip(injection_ip);
result->set_iter_before_fi(count_loop_iter_before); result->set_iter_before_fi(count_loop_iter_before);
log << "fault injected @ ip " << injection_ip log << "fault injected @ ip " << injection_ip
@ -286,7 +286,7 @@ bool WeatherMonitorExperiment::run()
result->set_iter_after_fi(count_loop_iter_after); result->set_iter_after_fi(count_loop_iter_after);
// record latest IP regardless of result // record latest IP regardless of result
result->set_latest_ip(simulator.getRegisterManager().getInstructionPointer()); result->set_latest_ip(simulator.getCPU(0).getInstructionPointer());
if (ev == &ev_end) { if (ev == &ev_end) {
log << "Result FINISHED (" << dec log << "Result FINISHED (" << dec
@ -314,7 +314,7 @@ bool WeatherMonitorExperiment::run()
result->set_resulttype(result->UNKNOWN); result->set_resulttype(result->UNKNOWN);
stringstream ss; stringstream ss;
ss << "eventid " << ev->getId() << " EIP " << simulator.getRegisterManager().getInstructionPointer(); ss << "eventid " << ev << " EIP " << simulator.getCPU(0).getInstructionPointer();
result->set_details(ss.str()); result->set_details(ss.str());
} }
} }