christoph/fail
1
Fork 0
Code Releases Activity

coolchecksum adapted to ProtoStream

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1282 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hellwig
2012-05-30 12:56:29 +00:00
parent 2566658b53
commit 2ab9284f73
6 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/experiments/coolchecksum/campaign.cc
View File

@ -4,6 +4,7 @@
#include "experimentInfo.hpp"
#include "controller/CampaignManager.hpp"
#include "util/Logger.hpp"
#include "util/ProtoStream.hpp"
#include "SAL/SALConfig.hpp"
#if COOL_FAULTSPACE_PRUNING
@ -82,9 +83,7 @@ bool CoolChecksumCampaign::run()
log << "couldn't open " << trace_filename << endl;
return false;
}
Trace trace;
trace.ParseFromIstream(&tracef);
tracef.close();
ProtoIStream ps(&tracef);
// set of equivalence classes that need one (rather: eight, one for
// each bit in that byte) experiment to determine them all
@ -105,19 +104,19 @@ bool CoolChecksumCampaign::run()
// XXX reorganizing the trace for efficient seeks could speed this up
int instr = 0;
sal::address_t instr_absolute = 0; // FIXME this one probably should also be recorded ...
Trace_Event const *ev;
for (int eventnr = 0; eventnr < trace.event_size(); ++eventnr) {
ev = &trace.event(eventnr);
Trace_Event ev;
ps.reset();
while(ps.getNext(&ev)) {
// only count instruction events
if (!ev->has_memaddr()) {
if (!ev.has_memaddr()) {
// new instruction
instr++;
instr_absolute = ev->ip();
instr_absolute = ev.ip();
continue;
// skip accesses to other data
} else if (ev->memaddr() != byte_offset + COOL_ECC_OBJUNDERTEST) {
} else if (ev.memaddr() != byte_offset + COOL_ECC_OBJUNDERTEST) {
continue;
// skip zero-sized intervals: these can
@ -137,12 +136,12 @@ bool CoolChecksumCampaign::run()
current_ec.instr2_absolute = instr_absolute;
current_ec.byte_offset = byte_offset;
if (ev->accesstype() == ev->READ) {
if (ev.accesstype() == ev.READ) {
// a sequence ending with READ: we need
// to do one experiment to cover it
// completely
ecs_need_experiment.push_back(current_ec);
} else if (ev->accesstype() == ev->WRITE) {
} else if (ev.accesstype() == ev.WRITE) {
// a sequence ending with WRITE: an
// injection anywhere here would have
// no effect.

6
core/experiments/coolchecksum/experiment.cc
View File

@ -62,8 +62,8 @@ bool CoolChecksumExperiment::run()
tp.restrictMemoryAddresses(&mm);
// record trace
Trace trace;
tp.setTraceMessage(&trace);
std::ofstream of("trace.pb");
tp.setTraceFile(&of);
// this must be done *after* configuring the plugin:
sal::simulator.addFlow(&tp);
@ -86,13 +86,11 @@ bool CoolChecksumExperiment::run()
sal::simulator.removeFlow(&tp);
// serialize trace to file
std::ofstream of("trace.pb");
if (of.fail()) {
log << "failed to write trace.pb" << endl;
sal::simulator.clearEvents(this);
return false;
}
trace.SerializeToOstream(&of);
of.close();
#endif