ecos_kernel_test experiment update

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1444 8c4709b5-6ec9-48aa-a5cd-a96041d1645a

src/experiments/ecos_kernel_test/campaign.cc

@@ -19,7 +19,7 @@
 using namespace std;
 using namespace fail;
 
-char const * const trace_filename = "trace.tc";
+char const * const trace_filename = "trace.tc"; //TODO: sync with experiment.cc
 char const * const results_filename = "ecos_kernel_test.csv";
 char const * const mm_filename = "memory_map.txt"; //TODO: sync with experiment.cc
 
@@ -31,17 +31,17 @@ bool EcosKernelTestCampaign::readMemoryMap(fail::MemoryMap &mm, char const * con
 	}
 
 	string buf;
-	stringstream ss(ios::in);
 	unsigned guest_addr, guest_len;
 	unsigned count = 0;
 
 	while (getline(file, buf)) {
-		ss.str(buf);
+		stringstream ss(buf, ios::in);
 		ss >> guest_addr >> guest_len;
 		mm.add(guest_addr, guest_len);
 		count++;
 	}
 	file.close();
+	assert(count > 0);
 	return (count > 0);
 }
 

src/experiments/ecos_kernel_test/experiment.cc

@@ -6,7 +6,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "util/Logger.hpp"
+
 #include "experiment.hpp"
 #include "experimentInfo.hpp"
 #include "campaign.hpp"
@@ -22,6 +22,8 @@
 
 #define LOCAL 0
 
+#define PREREQUISITES 0 // 1: do step 0-2 ; 0: do step 3
+
 using namespace std;
 using namespace fail;
 
@@ -33,18 +35,14 @@ using namespace fail;
 
 
 char const * const mm_filename = "memory_map.txt";
-
-bool EcosKernelTestExperiment::run()
-{
 char const *statename = "ecos_kernel_test.state";
-	Logger log("eCos Kernel Test", false);
-	BPSingleEvent bp;
-	
-	log << "startup" << endl;
 
+#if PREREQUISITES
+bool EcosKernelTestExperiment::retrieveGuestAddresses() {
 	log << "STEP 0: record memory map with addresses of 'interesting' objects" << endl;
-	{
+
 	// workaround for 00002808875p[BIOS ] >>PANIC<< Keyboard error:21
+	BPSingleEvent bp;
 	bp.setWatchInstructionPointer(ANY_ADDR);
 	simulator.addEventAndWait(&bp);
 
@@ -68,7 +66,6 @@ bool EcosKernelTestExperiment::run()
 	while (simulator.waitAny() != &record_timeout) {
 		simulator.addEvent(&g);
 		str->push_back(g.getData());
-
 		if (g.getData() == '\t') {
 			// addr complete?
 			//cout << "full: " << *str << "sub: " << str->substr(str->find_last_of('x') - 1) << endl;
@@ -90,31 +87,32 @@ bool EcosKernelTestExperiment::run()
 		}
 	}
 	assert(number_of_guest_events > 0);
-		cout << "Record timeout reached: created memory map (" << number_of_guest_events << " entries)" << endl;
+	log << "Record timeout reached: created memory map (" << number_of_guest_events << " entries)" << endl;
 	delete str;
 
 	// close serialized mm
 	mm.flush();
 	mm.close();
 
-		// clean up simulator and reboot the guest system
+	// clean up simulator
 	simulator.clearEvents();
-		log << "rebooting ..." << endl;
+	return true;
-		simulator.reboot();
 }
 
+bool EcosKernelTestExperiment::establishState() {
 	log << "STEP 1: run until interesting function starts, and save state" << endl;
-	{
+
 	GuestEvent g;
 
 	while (true) {
 		simulator.addEventAndWait(&g);
 		if(g.getData() == 'Q') {
-			  cout << "Guest system triggered: " << g.getData() << endl;
+		  log << "Guest system triggered: " << g.getData() << endl;
 		  break;
 		}
 	}
 
+	BPSingleEvent bp;
 	bp.setWatchInstructionPointer(ECOS_FUNC_ENTRY);
 	simulator.addEventAndWait(&bp);
 	log << "test function entry reached, saving state" << endl;
@@ -124,14 +122,14 @@ bool EcosKernelTestExperiment::run()
 	assert(bp.getTriggerInstructionPointer() == ECOS_FUNC_ENTRY);
 	assert(simulator.getRegisterManager().getInstructionPointer() == ECOS_FUNC_ENTRY);
 
-		// clean up simulator and reboot the guest system
+	// clean up simulator
 	simulator.clearEvents();
-		log << "rebooting ..." << endl;
+	return true;
-		simulator.reboot();
 }
 
+bool EcosKernelTestExperiment::performTrace() {
 	log << "STEP 2: record trace for fault-space pruning" << endl;
-	{
+
 	log << "restoring state" << endl;
 	simulator.restore(statename);
 	log << "EIP = " << hex << simulator.getRegisterManager().getInstructionPointer() << endl;
@@ -150,10 +148,10 @@ bool EcosKernelTestExperiment::run()
 	char const *tracefile = "trace.tc";
 	ofstream of(tracefile);
 	tp.setTraceFile(&of);
-
 	// this must be done *after* configuring the plugin:
 	simulator.addFlow(&tp);
 
+	BPSingleEvent bp;
 #if 1
 	// trace WEATHER_NUMITER_TRACING measurement loop iterations
 	// -> calibration
@@ -182,7 +180,6 @@ bool EcosKernelTestExperiment::run()
 	log << dec << "tracing finished after " << instr_counter  << " instructions" << endl;
 	//TODO: safe this value for experiment STEP 3
 
-
 	simulator.removeFlow(&tp);
 
 	// serialize trace to file
@@ -193,10 +190,18 @@ bool EcosKernelTestExperiment::run()
 	}
 	of.close();
 	log << "trace written to " << tracefile << endl;
+	
+	// clean up simulator
+	simulator.clearEvents();
+	return true;
 }
 
-#if 0
+#else // !PREREQUISITES
-	// STEP 3: The actual experiment.
+bool EcosKernelTestExperiment::faultInjection() {
+	log << "STEP 3: The actual experiment." << endl;
+
+	BPSingleEvent bp;
+	
 #if !LOCAL
 	for (int i = 0; i < 400; ++i) { // more than 400 will be very slow (500 is max)
 #endif
@@ -431,8 +436,37 @@ bool EcosKernelTestExperiment::run()
 #if !LOCAL
 	}
 #endif
+}
+#endif // PREREQUISITES
+
+bool EcosKernelTestExperiment::run()
+{
+	log << "startup" << endl;
+
+	#if PREREQUISITES
+	// step 0
+	if(retrieveGuestAddresses()) {
+		log << "STEP 0 finished: rebooting ..." << endl;
+		simulator.reboot();
+	} else { return false; }
+
+	// step 1
+	if(establishState()) {
+		log << "STEP 1 finished: rebooting ..." << endl;
+		simulator.reboot();
+	} else { return false; }
+
+	// step 2
+	if(performTrace()) {
+		log << "STEP 2 finished: terminating ..." << endl;
+	} else { return false; }
+
+	#else // !PREREQUISITES
+	// step 3
+	faultInjection();
+	#endif // PREREQUISITES
 
-#endif
 	// Explicitly terminate, or the simulator will continue to run.
 	simulator.terminate();
+	return true;
 }

src/experiments/ecos_kernel_test/experiment.hpp

@@ -2,11 +2,18 @@
   
 #include "efw/ExperimentFlow.hpp"
 #include "efw/JobClient.hpp"
+#include "util/Logger.hpp"
 
 class EcosKernelTestExperiment : public fail::ExperimentFlow {
 	fail::JobClient m_jc;
+	fail::Logger log;
 public:
-	EcosKernelTestExperiment() : m_jc("ios.cs.tu-dortmund.de") {}
+	EcosKernelTestExperiment() : m_jc("ios.cs.tu-dortmund.de"), log("eCos Kernel Test", false) {}
 	bool run();
+
+	bool retrieveGuestAddresses(); // step 0
+	bool establishState(); // step 1
+	bool performTrace(); // step 2
+	bool faultInjection(); // step 3
 };