From 03c1ce8a0f90ee9b29ab8138483700539fb4844a Mon Sep 17 00:00:00 2001
From: hellwig <hellwig@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Tue, 5 Jun 2012 12:48:53 +0000
Subject: [PATCH] weathermonitor-experiment adapted to ProtoStream

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1299 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
 core/experiments/weathermonitor/campaign.cc   | 26 ++++++++-----------
 core/experiments/weathermonitor/experiment.cc |  7 ++---
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/core/experiments/weathermonitor/campaign.cc b/core/experiments/weathermonitor/campaign.cc
index 9a9c0507..f9c37ea8 100644
--- a/core/experiments/weathermonitor/campaign.cc
+++ b/core/experiments/weathermonitor/campaign.cc
@@ -7,6 +7,7 @@
 #include "controller/CampaignManager.hpp"
 #include "util/Logger.hpp"
 #include "util/MemoryMap.hpp"
+#include "util/ProtoStream.hpp"
 
 #include "vptr_map.hpp"
 
@@ -43,16 +44,12 @@ bool WeathermonitorCampaign::run()
 	log << "startup" << endl;
 
 	// load trace
-	log << "loading trace ..." << endl;
 	ifstream tracef(trace_filename);
 	if (tracef.fail()) {
 		log << "couldn't open " << trace_filename << endl;
 		return false;
 	}
-	Trace trace;
-	trace.ParseFromIstream(&tracef);
-	tracef.close();
-	log << "... done." << endl;
+	ProtoIStream ps(&tracef);
 
 	// a map of FI data addresses
 	MemoryMap mm;
@@ -81,24 +78,23 @@ bool WeathermonitorCampaign::run()
 		current_ec.instr1 = 0;
 		int instr = 0;
 		sal::address_t instr_absolute = 0; // FIXME this one probably should also be recorded ...
-		Trace_Event const *ev;
+		Trace_Event ev;
+		ps.reset();
 
 		// for every section in the trace between subsequent memory
 		// accesses to that address ...
-		for (int eventnr = 0; eventnr < trace.event_size(); ++eventnr) {
-			ev = &trace.event(eventnr);
-
+		while(ps.getNext(&ev)) {
 			// instruction events just get counted
-			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
 			// FIXME again, do it the other way around, and use mm.isMatching()!
-			} else if (ev->memaddr() + ev->width() <= data_address
-			        || ev->memaddr() > data_address) {
+			} else if (ev.memaddr() + ev.width() <= data_address
+			        || ev.memaddr() > data_address) {
 				continue;
 
 			// skip zero-sized intervals: these can
@@ -118,7 +114,7 @@ bool WeathermonitorCampaign::run()
 			current_ec.instr2_absolute = instr_absolute;
 			current_ec.data_address = data_address;
 
-			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
@@ -137,7 +133,7 @@ bool WeathermonitorCampaign::run()
 
 				fi::campaignmanager.addParam(d);
 				++count;
-			} 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.
diff --git a/core/experiments/weathermonitor/experiment.cc b/core/experiments/weathermonitor/experiment.cc
index 724c64fb..b90a53b5 100644
--- a/core/experiments/weathermonitor/experiment.cc
+++ b/core/experiments/weathermonitor/experiment.cc
@@ -68,8 +68,8 @@ bool WeathermonitorExperiment::run()
 	//tp.setLogIPOnly(true);
 
 	// 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);
@@ -94,14 +94,11 @@ bool WeathermonitorExperiment::run()
 	sal::simulator.removeFlow(&tp);
 
 	// serialize trace to file
-	char const *tracefile = "trace.pb";
-	std::ofstream of(tracefile);
 	if (of.fail()) {
 		log << "failed to write " << tracefile << endl;
 		sal::simulator.clearEvents(this); // cleanup
 		return false;
 	}
-	trace.SerializeToOstream(&of);
 	of.close();
 	log << "trace written to " << tracefile << endl;