christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

checksum-oostubs: campaign works now

Browse Source 
... but leaves a few clients in an endless loop, for unknown reasons.
Still debugging.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1046 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-04-11 01:00:18 +00:00
parent 241c8f27a8
commit 60440de13a
1 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
core/experiments/checksum-oostubs/campaign.cc
View File

@ -77,6 +77,7 @@ bool ChecksumOOStuBSCampaign::run()
// experiment count // experiment count
int count = 0; int count = 0;
// XXX do it the other way around: iterate over trace, search addresses
// for every injection address ... // for every injection address ...
for (MemoryMap::iterator it = mm.begin(); it != mm.end(); ++it) { for (MemoryMap::iterator it = mm.begin(); it != mm.end(); ++it) {
std::cerr << "."; std::cerr << ".";
@ -196,60 +197,65 @@ bool ChecksumOOStuBSCampaign::run()
log << "pruning: reduced " << num_dumb_experiments * 8 << log << "pruning: reduced " << num_dumb_experiments * 8 <<
" experiments to " << ecs_need_experiment.size() * 8 << endl; " experiments to " << ecs_need_experiment.size() * 8 << endl;
/*
// CSV header // CSV header
results << "injection_ip\tinstr_offset\tinjection_bit\tresulttype\tresultdata\terror_corrected\tdetails" << endl; results << "ec_instr1\tec_instr2\tec_instr2_absolute\tec_data_address\tbitnr\tresulttype\tresult0\tresult1\tresult2\tfinish_reached\tlatest_ip\terror_corrected\tdetails" << endl;
// store no-effect "experiment" results // store no-effect "experiment" results
// (for comparison reasons; we'll store that more compactly later)
for (std::vector<equivalence_class>::const_iterator it = ecs_no_effect.begin(); for (std::vector<equivalence_class>::const_iterator it = ecs_no_effect.begin();
it != ecs_no_effect.end(); ++it) { it != ecs_no_effect.end(); ++it) {
for (int bitnr = 0; bitnr < 8; ++bitnr) { results
for (int instr = (*it).instr1; instr <= (*it).instr2; ++instr) { << (*it).instr1 << "\t"
results << (*it).instr2 << "\t"
<< (*it).instr2_absolute << "\t" // incorrect in all but one case! << (*it).instr2_absolute << "\t" // incorrect in all but one case!
<< instr << "\t" << (*it).data_address << "\t"
<< ((*it).byte_offset * 8 + bitnr) << "\t" << "99\t" // dummy value: we didn't do any real experiments
<< "1" << "\t" << "1\t"
<< "45" << "\t" << "99\t99\t99\t"
<< "0" << "\t" << "1\t"
<< "" << "\n"; << "99\t"
} << "0\t\n";
}
} }
// collect results // collect results
CoolChecksumExperimentData *res; ChecksumOOStuBSExperimentData *res;
int rescount = 0; int rescount = 0;
while ((res = static_cast<CoolChecksumExperimentData *>(fi::campaignmanager.getDone()))) { while ((res = static_cast<ChecksumOOStuBSExperimentData *>(fi::campaignmanager.getDone()))) {
rescount++; rescount++;
equivalence_class *ec = experiment_ecs[res]; std::map<ChecksumOOStuBSExperimentData *, unsigned>::iterator it =
experiment_ecs.find(res);
// sanity check if (it == experiment_ecs.end()) {
if (ec->instr2 != res->msg.instr_offset()) { results << "WTF, didn't find res!" << endl;
results << "WTF" << endl; log << "WTF, didn't find res!" << endl;
log << "WTF" << endl;
delete res;
continue; continue;
} }
equivalence_class &ec = ecs_need_experiment[it->second];
// explode equivalence class to single "experiments" // sanity check
// (for comparison reasons; we'll store that more compactly later) if (ec.instr2 != res->msg.instr_offset()) {
for (int instr = ec->instr1; instr <= ec->instr2; ++instr) { results << "WTF" << endl;
results log << "WTF" << endl;
<< res->msg.injection_ip() << "\t" // incorrect in all but one case! //delete res; // currently racy if jobs are reassigned
<< instr << "\t"
<< res->msg.bit_offset() << "\t"
<< res->msg.resulttype() << "\t"
<< res->msg.resultdata() << "\t"
<< res->msg.error_corrected() << "\t"
<< res->msg.details() << "\n";
} }
delete res;
results
<< ec.instr1 << "\t"
<< ec.instr2 << "\t"
<< ec.instr2_absolute << "\t" // incorrect in all but one case!
<< ec.data_address << "\t"
<< res->msg.bit_offset() << "\t"
<< res->msg.resulttype() << "\t"
<< res->msg.resultdata(0) << "\t"
<< res->msg.resultdata(1) << "\t"
<< res->msg.resultdata(2) << "\t"
<< res->msg.finish_reached() << "\t"
<< res->msg.latest_ip() << "\t"
<< res->msg.error_corrected() << "\t"
<< res->msg.details() << "\n";
//delete res; // currently racy if jobs are reassigned
} }
log << "done. sent " << count << " received " << rescount << endl; log << "done. sent " << count << " received " << rescount << endl;
results.close(); results.close();
*/
return true; return true;
} }