christoph/fail
1
Fork 0
Code Releases Activity

Two minor bugfixes

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1935 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-11-20 09:58:44 +00:00
parent 49d1608969
commit 4db7272e5f
3 changed files with 135 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/experiments/l4-sys/experiment.hpp
View File

@ -25,10 +25,20 @@ typedef struct TraceInstrType {
typedef std::vector<TraceInstr> TraceVector;
class L4SysExperiment : public fail::ExperimentFlow {
fail::JobClient m_jc;
private:
fail::JobClient m_jc; //!< the job client connecting to the campaign server
fail::Logger log; //<! the logger
//! our current parameter set is globally available among the object
L4SysExperimentData *param;
public:
L4SysExperiment() : m_jc("localhost") {}
L4SysExperiment() : m_jc("localhost"), log("L4Sys", false), param(NULL) {}
bool run();
protected:
/**
* Frees all attached resources and terminates the simulator.
* @param reason the exit reason, i.e. exit code, passed on to simulator::terminate
*/
void terminate(int reason);
private:
/**
* Sanitises the output string of the serial device monitored.
@ -66,11 +76,9 @@ private:
*/
bx_bool fetchInstruction(BX_CPU_C *instance, const Bit8u *instr, bxInstruction_c *iStorage);
/**
* Write out the injection parameters to the given logger.
* @param log A reference to the Logger object
* @param param The experiment parameter object to log data from
* Write out the injection parameters to the logger.
*/
void logInjection(fail::Logger &log, const L4SysExperimentData &param);
void logInjection();
/**
* Proceeds by one single instruction.
* @param preserveAddressSpace if set, the address space of the next instruction