christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

weather-monitor: now uses elfreader

Browse Source 
This commit modifies the weather-monitor experiment so that it
uses util/ElfReader instead of "nm -C" in a wrapper-script to
determine the various symbol addresses. experimentInfo.hpp now
only contains (rudimentary) configuration data for the experiment.
Furthermore this commit modularizes the experiment's code so that
there no longer is a humongous run() method.

Change-Id: I42461e1dabb5050af372810bb9fb61a6fccd0d99
This commit is contained in:
Michael Lenz
2014-04-25 15:29:06 +02:00
parent 84b7a1d08a
commit daedb5a4d6
5 changed files with 278 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/experiments/weather-monitor/experiment.hpp
View File

@ -4,10 +4,39 @@
#include "efw/ExperimentFlow.hpp"
#include "efw/JobClient.hpp"
#include "util/Logger.hpp"
#include "util/ElfReader.hpp"
#include "sal/Listener.hpp"
#include "sal/SALConfig.hpp"
class WeatherMonitorExperiment : public fail::ExperimentFlow {
fail::JobClient m_jc;
std::string m_variant, m_benchmark;
static const std::string dir_images;
static const std::string dir_prerequisites;
fail::Logger log;
fail::BPSingleListener bp;
std::string filename_elf(const std::string& variant, const std::string& benchmark);
std::string filename_state(const std::string& variant, const std::string& benchmark);
std::string filename_trace(const std::string& variant, const std::string& benchmark);
std::string filename_traceinfo(const std::string& variant, const std::string& benchmark);
bool writeTraceInfo(unsigned numinstr_tracing, unsigned numinstr_after);
bool readTraceInfo(unsigned& numinstr_tracing, unsigned& numinstr_after);
bool readElfSymbols(fail::guest_address_t& entry, fail::guest_address_t& text_start,
fail::guest_address_t& text_end, fail::guest_address_t& data_start,
fail::guest_address_t& data_end, fail::guest_address_t& wait_begin,
fail::guest_address_t& wait_end, fail::guest_address_t& vptr_panic);
bool establishState(fail::guest_address_t& entry);
bool performTrace(fail::guest_address_t& entry, fail::guest_address_t& data_start,
fail::guest_address_t& data_end, fail::guest_address_t& wait_end);
bool faultInjection();
public:
WeatherMonitorExperiment() : log("Weathermonitor", false) {}
bool run();
void parseOptions(void);
};
#endif // __WEATHERMONITOR_EXPERIMENT_HPP__