christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Ensuring parsability in case of exceptions

Browse Source 
by removing unnecessary newline characters


git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1874 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-11-01 13:28:52 +00:00
parent 1423fb93dd
commit cb3775b290
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/experiments/l4-sys/experiment.cc
View File

@ -334,8 +334,8 @@ bool L4SysExperiment::run() {
if (injection_ip != curr_instr.trigger_addr) { if (injection_ip != curr_instr.trigger_addr) {
stringstream ss; stringstream ss;
ss << "SANITY CHECK FAILED: " << injection_ip << " != " ss << "SANITY CHECK FAILED: " << injection_ip << " != "
<< curr_instr.trigger_addr << endl; << curr_instr.trigger_addr;
log << ss.str(); log << ss.str() << endl;
param.msg.set_resulttype(param.msg.UNKNOWN); param.msg.set_resulttype(param.msg.UNKNOWN);
param.msg.set_resultdata(injection_ip); param.msg.set_resultdata(injection_ip);
param.msg.set_details(ss.str()); param.msg.set_details(ss.str());
@ -355,7 +355,7 @@ bool L4SysExperiment::run() {
param.msg.set_output(sanitised(output.c_str())); param.msg.set_output(sanitised(output.c_str()));
stringstream ss; stringstream ss;
ss << "Sent package did not contain the injection location (register offset)" << endl; ss << "Sent package did not contain the injection location (register offset)";
param.msg.set_details(ss.str()); param.msg.set_details(ss.str());
m_jc.sendResult(param); m_jc.sendResult(param);
simulator.terminate(30); simulator.terminate(30);
@ -423,7 +423,7 @@ bool L4SysExperiment::run() {
param.msg.set_output(sanitised(output.c_str())); param.msg.set_output(sanitised(output.c_str()));
stringstream ss; stringstream ss;
ss << "Could not decode instruction using UDIS86" << endl; ss << "Could not decode instruction using UDIS86";
param.msg.set_details(ss.str()); param.msg.set_details(ss.str());
m_jc.sendResult(param); m_jc.sendResult(param);
simulator.terminate(32); simulator.terminate(32);
@ -485,7 +485,7 @@ bool L4SysExperiment::run() {
param.msg.set_output(sanitised(output.c_str())); param.msg.set_output(sanitised(output.c_str()));
stringstream ss; stringstream ss;
ss << "Reached the end of the experiment without finding an appropriate instruction" << endl; ss << "Reached the end of the experiment without finding an appropriate instruction";
param.msg.set_details(ss.str()); param.msg.set_details(ss.str());
m_jc.sendResult(param); m_jc.sendResult(param);
simulator.terminate(33); simulator.terminate(33);
@ -565,7 +565,7 @@ bool L4SysExperiment::run() {
param.msg.set_output(sanitised(output.c_str())); param.msg.set_output(sanitised(output.c_str()));
stringstream ss; stringstream ss;
ss << "Reached the end of the experiment without finding an appropriate instruction" << endl; ss << "Reached the end of the experiment without finding an appropriate instruction";
param.msg.set_details(ss.str()); param.msg.set_details(ss.str());
m_jc.sendResult(param); m_jc.sendResult(param);
simulator.terminate(33); simulator.terminate(33);
@ -586,7 +586,7 @@ bool L4SysExperiment::run() {
param.msg.set_output(sanitised(output.c_str())); param.msg.set_output(sanitised(output.c_str()));
ostringstream oss; ostringstream oss;
oss << "Did not hit an ALU instruction - correct the source code please!" << endl; oss << "Did not hit an ALU instruction - correct the source code please!";
param.msg.set_details(oss.str()); param.msg.set_details(oss.str());
m_jc.sendResult(param); m_jc.sendResult(param);
simulator.terminate(40); simulator.terminate(40);
@ -650,8 +650,7 @@ bool L4SysExperiment::run() {
stringstream ss; stringstream ss;
ss << "eventid " << ev << " EIP " ss << "eventid " << ev << " EIP "
<< simulator.getRegisterManager().getInstructionPointer() << simulator.getRegisterManager().getInstructionPointer();
<< endl;
param.msg.set_details(ss.str()); param.msg.set_details(ss.str());
} }