Namespaces unified (sal+fi -> fail), Code cleanups (-> coding-style.txt), Doxygen-comments fixed.
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1319 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
@ -23,12 +23,12 @@
|
||||
|
||||
#define LOCAL 0
|
||||
|
||||
using std::endl;
|
||||
using namespace std;
|
||||
using namespace fail;
|
||||
|
||||
// Check if configuration dependencies are satisfied:
|
||||
#if !defined(CONFIG_EVENT_BREAKPOINTS) || !defined(CONFIG_SR_RESTORE) || \
|
||||
!defined(CONFIG_SR_SAVE) || !defined(CONFIG_EVENT_TRAP)
|
||||
|
||||
#error This experiment needs: breakpoints, traps, save, and restore. Enable these in the configuration.
|
||||
#endif
|
||||
|
||||
@ -36,32 +36,32 @@ bool WeathermonitorExperiment::run()
|
||||
{
|
||||
char const *statename = "bochs.state";
|
||||
Logger log("Weathermonitor", false);
|
||||
fi::BPSingleEvent bp;
|
||||
BPSingleEvent bp;
|
||||
|
||||
log << "startup" << endl;
|
||||
|
||||
#if 1
|
||||
// STEP 0: record memory map with vptr addresses
|
||||
fi::GuestEvent g;
|
||||
GuestEvent g;
|
||||
while (true) {
|
||||
sal::simulator.addEventAndWait(&g);
|
||||
std::cout << g.getData() << std::flush;
|
||||
simulator.addEventAndWait(&g);
|
||||
cout << g.getData() << flush;
|
||||
}
|
||||
#elif 0
|
||||
// STEP 1: run until interesting function starts, and save state
|
||||
bp.setWatchInstructionPointer(WEATHER_FUNC_MAIN);
|
||||
sal::simulator.addEventAndWait(&bp);
|
||||
simulator.addEventAndWait(&bp);
|
||||
log << "test function entry reached, saving state" << endl;
|
||||
log << "EIP = " << std::hex << bp.getTriggerInstructionPointer() << endl;
|
||||
sal::simulator.save(statename);
|
||||
log << "EIP = " << hex << bp.getTriggerInstructionPointer() << endl;
|
||||
simulator.save(statename);
|
||||
assert(bp.getTriggerInstructionPointer() == WEATHER_FUNC_MAIN);
|
||||
assert(sal::simulator.getRegisterManager().getInstructionPointer() == WEATHER_FUNC_MAIN);
|
||||
assert(simulator.getRegisterManager().getInstructionPointer() == WEATHER_FUNC_MAIN);
|
||||
|
||||
// STEP 2: record trace for fault-space pruning
|
||||
log << "restoring state" << endl;
|
||||
sal::simulator.restore(statename);
|
||||
log << "EIP = " << std::hex << sal::simulator.getRegisterManager().getInstructionPointer() << endl;
|
||||
assert(sal::simulator.getRegisterManager().getInstructionPointer() == WEATHER_FUNC_MAIN);
|
||||
simulator.restore(statename);
|
||||
log << "EIP = " << hex << simulator.getRegisterManager().getInstructionPointer() << endl;
|
||||
assert(simulator.getRegisterManager().getInstructionPointer() == WEATHER_FUNC_MAIN);
|
||||
|
||||
log << "enabling tracing" << endl;
|
||||
TracingPlugin tp;
|
||||
@ -76,35 +76,35 @@ bool WeathermonitorExperiment::run()
|
||||
|
||||
// record trace
|
||||
char const *tracefile = "trace.pb";
|
||||
std::ofstream of(tracefile);
|
||||
ofstream of(tracefile);
|
||||
tp.setTraceFile(&of);
|
||||
|
||||
// this must be done *after* configuring the plugin:
|
||||
sal::simulator.addFlow(&tp);
|
||||
simulator.addFlow(&tp);
|
||||
|
||||
// trace WEATHER_NUMITER_TRACING measurement loop iterations
|
||||
bp.setWatchInstructionPointer(WEATHER_FUNC_WAIT_END);
|
||||
bp.setCounter(WEATHER_NUMITER_TRACING);
|
||||
sal::simulator.addEvent(&bp);
|
||||
fi::BPSingleEvent ev_count(fi::ANY_ADDR);
|
||||
sal::simulator.addEvent(&ev_count);
|
||||
simulator.addEvent(&bp);
|
||||
BPSingleEvent ev_count(ANY_ADDR);
|
||||
simulator.addEvent(&ev_count);
|
||||
|
||||
// count instructions
|
||||
// FIXME add SAL functionality for this?
|
||||
int instr_counter = 0;
|
||||
while (sal::simulator.waitAny() == &ev_count) {
|
||||
while (simulator.waitAny() == &ev_count) {
|
||||
++instr_counter;
|
||||
sal::simulator.addEvent(&ev_count);
|
||||
simulator.addEvent(&ev_count);
|
||||
}
|
||||
|
||||
log << std::dec << "tracing finished after " << instr_counter
|
||||
log << dec << "tracing finished after " << instr_counter
|
||||
<< " instructions, seeing wait_end " << WEATHER_NUMITER_TRACING << " times" << endl;
|
||||
sal::simulator.removeFlow(&tp);
|
||||
simulator.removeFlow(&tp);
|
||||
|
||||
// serialize trace to file
|
||||
if (of.fail()) {
|
||||
log << "failed to write " << tracefile << endl;
|
||||
sal::simulator.clearEvents(this); // cleanup
|
||||
simulator.clearEvents(this); // cleanup
|
||||
return false;
|
||||
}
|
||||
of.close();
|
||||
@ -113,17 +113,17 @@ bool WeathermonitorExperiment::run()
|
||||
// wait another WEATHER_NUMITER_AFTER measurement loop iterations
|
||||
bp.setWatchInstructionPointer(WEATHER_FUNC_WAIT_END);
|
||||
bp.setCounter(WEATHER_NUMITER_AFTER);
|
||||
sal::simulator.addEvent(&bp);
|
||||
simulator.addEvent(&bp);
|
||||
|
||||
// count instructions
|
||||
// FIXME add SAL functionality for this?
|
||||
instr_counter = 0;
|
||||
while (sal::simulator.waitAny() == &ev_count) {
|
||||
while (simulator.waitAny() == &ev_count) {
|
||||
++instr_counter;
|
||||
sal::simulator.addEvent(&ev_count);
|
||||
simulator.addEvent(&ev_count);
|
||||
}
|
||||
|
||||
log << std::dec << "experiment finished after " << instr_counter
|
||||
log << dec << "experiment finished after " << instr_counter
|
||||
<< " instructions, seeing wait_end " << WEATHER_NUMITER_AFTER << " times" << endl;
|
||||
|
||||
#elif 0
|
||||
@ -139,7 +139,7 @@ bool WeathermonitorExperiment::run()
|
||||
if (!m_jc.getParam(param)) {
|
||||
log << "Dying." << endl;
|
||||
// communicate that we were told to die
|
||||
sal::simulator.terminate(1);
|
||||
simulator.terminate(1);
|
||||
}
|
||||
#else
|
||||
// XXX debug
|
||||
@ -157,62 +157,62 @@ bool WeathermonitorExperiment::run()
|
||||
// 8 results in one job
|
||||
WeathermonitorProtoMsg_Result *result = param.msg.add_result();
|
||||
result->set_bit_offset(bit_offset);
|
||||
log << std::dec << "job " << id << " instr " << instr_offset
|
||||
log << dec << "job " << id << " instr " << instr_offset
|
||||
<< " mem " << mem_addr << "+" << bit_offset << endl;
|
||||
|
||||
log << "restoring state" << endl;
|
||||
sal::simulator.restore(statename);
|
||||
simulator.restore(statename);
|
||||
|
||||
// XXX debug
|
||||
/*
|
||||
std::stringstream fname;
|
||||
stringstream fname;
|
||||
fname << "job." << ::getpid();
|
||||
std::ofstream job(fname.str().c_str());
|
||||
ofstream job(fname.str().c_str());
|
||||
job << "job " << id << " instr " << instr_offset << " (" << param.msg.instr_address() << ") mem " << mem_addr << "+" << bit_offset << endl;
|
||||
job.close();
|
||||
*/
|
||||
|
||||
// this marks THE END
|
||||
fi::BPSingleEvent ev_end(fi::ANY_ADDR);
|
||||
BPSingleEvent ev_end(ANY_ADDR);
|
||||
ev_end.setCounter(WEATHER_NUMINSTR_TRACING + WEATHER_NUMINSTR_AFTER);
|
||||
sal::simulator.addEvent(&ev_end);
|
||||
simulator.addEvent(&ev_end);
|
||||
|
||||
// count loop iterations by counting wait_begin() calls
|
||||
// FIXME would be nice to have a callback API for this as this needs to
|
||||
// be done "in parallel"
|
||||
fi::BPSingleEvent ev_wait_begin(WEATHER_FUNC_WAIT_BEGIN);
|
||||
sal::simulator.addEvent(&ev_wait_begin);
|
||||
BPSingleEvent ev_wait_begin(WEATHER_FUNC_WAIT_BEGIN);
|
||||
simulator.addEvent(&ev_wait_begin);
|
||||
int count_loop_iter_before = 0;
|
||||
|
||||
// no need to wait if offset is 0
|
||||
if (instr_offset > 0) {
|
||||
// XXX could be improved with intermediate states (reducing runtime until injection)
|
||||
bp.setWatchInstructionPointer(fi::ANY_ADDR);
|
||||
bp.setWatchInstructionPointer(ANY_ADDR);
|
||||
bp.setCounter(instr_offset);
|
||||
sal::simulator.addEvent(&bp);
|
||||
simulator.addEvent(&bp);
|
||||
|
||||
// count loop iterations until FI
|
||||
while (sal::simulator.waitAny() == &ev_wait_begin) {
|
||||
while (simulator.waitAny() == &ev_wait_begin) {
|
||||
++count_loop_iter_before;
|
||||
sal::simulator.addEvent(&ev_wait_begin);
|
||||
simulator.addEvent(&ev_wait_begin);
|
||||
}
|
||||
}
|
||||
|
||||
// --- fault injection ---
|
||||
sal::MemoryManager& mm = sal::simulator.getMemoryManager();
|
||||
sal::byte_t data = mm.getByte(mem_addr);
|
||||
sal::byte_t newdata = data ^ (1 << bit_offset);
|
||||
MemoryManager& mm = simulator.getMemoryManager();
|
||||
byte_t data = mm.getByte(mem_addr);
|
||||
byte_t newdata = data ^ (1 << bit_offset);
|
||||
mm.setByte(mem_addr, newdata);
|
||||
// note at what IP we did it
|
||||
int32_t injection_ip = sal::simulator.getRegisterManager().getInstructionPointer();
|
||||
int32_t injection_ip = simulator.getRegisterManager().getInstructionPointer();
|
||||
param.msg.set_injection_ip(injection_ip);
|
||||
result->set_iter_before_fi(count_loop_iter_before);
|
||||
log << "fault injected @ ip " << injection_ip
|
||||
<< " 0x" << std::hex << ((int)data) << " -> 0x" << ((int)newdata) << endl;
|
||||
<< " 0x" << hex << ((int)data) << " -> 0x" << ((int)newdata) << endl;
|
||||
// sanity check
|
||||
if (param.msg.has_instr_address() &&
|
||||
injection_ip != param.msg.instr_address()) {
|
||||
std::stringstream ss;
|
||||
stringstream ss;
|
||||
ss << "SANITY CHECK FAILED: " << injection_ip
|
||||
<< " != " << param.msg.instr_address();
|
||||
log << ss.str() << endl;
|
||||
@ -221,7 +221,7 @@ bool WeathermonitorExperiment::run()
|
||||
result->set_details(ss.str());
|
||||
result->set_iter_after_fi(0);
|
||||
|
||||
sal::simulator.clearEvents();
|
||||
simulator.clearEvents();
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -239,63 +239,63 @@ bool WeathermonitorExperiment::run()
|
||||
// - (XXX "sane" display?)
|
||||
|
||||
// catch traps as "extraordinary" ending
|
||||
fi::TrapEvent ev_trap(fi::ANY_TRAP);
|
||||
sal::simulator.addEvent(&ev_trap);
|
||||
TrapEvent ev_trap(ANY_TRAP);
|
||||
simulator.addEvent(&ev_trap);
|
||||
// jump outside text segment
|
||||
fi::BPRangeEvent ev_below_text(fi::ANY_ADDR, WEATHER_TEXT_START - 1);
|
||||
fi::BPRangeEvent ev_beyond_text(WEATHER_TEXT_END + 1, fi::ANY_ADDR);
|
||||
sal::simulator.addEvent(&ev_below_text);
|
||||
sal::simulator.addEvent(&ev_beyond_text);
|
||||
BPRangeEvent ev_below_text(ANY_ADDR, WEATHER_TEXT_START - 1);
|
||||
BPRangeEvent ev_beyond_text(WEATHER_TEXT_END + 1, ANY_ADDR);
|
||||
simulator.addEvent(&ev_below_text);
|
||||
simulator.addEvent(&ev_beyond_text);
|
||||
// error detected
|
||||
fi::BPSingleEvent ev_detected(WEATHER_FUNC_VPTR_PANIC);
|
||||
sal::simulator.addEvent(&ev_detected);
|
||||
BPSingleEvent ev_detected(WEATHER_FUNC_VPTR_PANIC);
|
||||
simulator.addEvent(&ev_detected);
|
||||
|
||||
#if LOCAL && 0
|
||||
// XXX debug
|
||||
log << "enabling tracing" << endl;
|
||||
TracingPlugin tp;
|
||||
tp.setLogIPOnly(true);
|
||||
tp.setOstream(&std::cout);
|
||||
tp.setOstream(&cout);
|
||||
// this must be done *after* configuring the plugin:
|
||||
sal::simulator.addFlow(&tp);
|
||||
simulator.addFlow(&tp);
|
||||
#endif
|
||||
|
||||
fi::BaseEvent* ev;
|
||||
BaseEvent* ev;
|
||||
|
||||
// count loop iterations
|
||||
int count_loop_iter_after = 0;
|
||||
while ((ev = sal::simulator.waitAny()) == &ev_wait_begin) {
|
||||
while ((ev = simulator.waitAny()) == &ev_wait_begin) {
|
||||
++count_loop_iter_after;
|
||||
sal::simulator.addEvent(&ev_wait_begin);
|
||||
simulator.addEvent(&ev_wait_begin);
|
||||
}
|
||||
result->set_iter_after_fi(count_loop_iter_after);
|
||||
|
||||
// record latest IP regardless of result
|
||||
result->set_latest_ip(sal::simulator.getRegisterManager().getInstructionPointer());
|
||||
result->set_latest_ip(simulator.getRegisterManager().getInstructionPointer());
|
||||
|
||||
if (ev == &ev_end) {
|
||||
log << "Result FINISHED (" << std::dec
|
||||
log << "Result FINISHED (" << dec
|
||||
<< count_loop_iter_before << "+" << count_loop_iter_after << ")" << endl;
|
||||
result->set_resulttype(result->FINISHED);
|
||||
} else if (ev == &ev_below_text || ev == &ev_beyond_text) {
|
||||
log << "Result OUTSIDE" << endl;
|
||||
result->set_resulttype(result->OUTSIDE);
|
||||
} else if (ev == &ev_trap) {
|
||||
log << std::dec << "Result TRAP #" << ev_trap.getTriggerNumber() << endl;
|
||||
log << dec << "Result TRAP #" << ev_trap.getTriggerNumber() << endl;
|
||||
result->set_resulttype(result->TRAP);
|
||||
|
||||
std::stringstream ss;
|
||||
stringstream ss;
|
||||
ss << ev_trap.getTriggerNumber();
|
||||
result->set_details(ss.str());
|
||||
} else if (ev == &ev_detected) {
|
||||
log << std::dec << "Result DETECTED" << endl;
|
||||
log << dec << "Result DETECTED" << endl;
|
||||
result->set_resulttype(result->DETECTED);
|
||||
} else {
|
||||
log << "Result WTF?" << endl;
|
||||
result->set_resulttype(result->UNKNOWN);
|
||||
|
||||
std::stringstream ss;
|
||||
ss << "eventid " << ev->getId() << " EIP " << sal::simulator.getRegisterManager().getInstructionPointer();
|
||||
stringstream ss;
|
||||
ss << "eventid " << ev->getId() << " EIP " << simulator.getRegisterManager().getInstructionPointer();
|
||||
result->set_details(ss.str());
|
||||
}
|
||||
}
|
||||
@ -311,5 +311,5 @@ bool WeathermonitorExperiment::run()
|
||||
|
||||
#endif
|
||||
// Explicitly terminate, or the simulator will continue to run.
|
||||
sal::simulator.terminate();
|
||||
simulator.terminate();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user