From 7c48c3e35cfc54ff4449802e452e1dc12bdfe624 Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Fri, 14 Sep 2012 16:03:17 +0000
Subject: [PATCH] RAMpage experiment: test whether the failing PFN was listed

+minor logging changes and comments

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1652 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
 src/experiments/rampage/experiment.cc | 28 ++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/experiments/rampage/experiment.cc b/src/experiments/rampage/experiment.cc
index 3f4006df..b8bcace5 100644
--- a/src/experiments/rampage/experiment.cc
+++ b/src/experiments/rampage/experiment.cc
@@ -165,13 +165,30 @@ bool RAMpageExperiment::handleIO(char c)
 	// tested %08x-%08x %08x-%08x ...
 	} else if (!m_output.compare(0, sizeof(STR_TESTED)-1, STR_TESTED)) {
 		m_last_line_was_startingtestpass = false;
-		m_log << STR_TESTED << std::endl;
+		//m_log << STR_TESTED << std::endl;
+
+		// test whether the failing PFN was listed
+		stringstream ss;
+		ss << m_output.substr(sizeof(STR_TESTED) - 1);
+		while (!ss.eof()) {
+			char c;
+			uint32_t a, b;
+			ss >> hex >> a >> c >> b;
+			if (ss.fail()) {
+				m_param->msg.set_details("unknown serial output: " + m_output);
+				terminateExperiment(m_param->msg.UNKNOWN);
+			}
+			if (a <= (m_param->msg.mem_addr() >> 12) &&
+			    (m_param->msg.mem_addr() >> 12) <= b) {
+				// we abort even if errortype == ERROR_NONE
+				m_log << "PF was tested but no error was found, aborting" << endl;
+				terminateExperiment(m_param->msg.PFN_WAS_LISTED);
+			}
+		}
 
-		// TODO test whether the failing PFN was listed
-		//terminateExperiment(m_param->msg.PFN_WAS_LISTED);
 	// bad frame at pfn %08x
 	} else if (!m_output.compare(0, sizeof(STR_BADFRAME)-1, STR_BADFRAME)) {
-		m_log << STR_BADFRAME << std::endl;
+		m_log << m_output << std::endl;
 
 		// test whether it was the right PFN
 		uint64_t pfn;
@@ -188,8 +205,9 @@ bool RAMpageExperiment::handleIO(char c)
 		} else {
 			terminateExperiment(m_param->msg.WRONG_PFN_DETECTED);
 		}
+
+	// unknown
 	} else {
-		// unknown
 		m_log << "wtf unknown: " << m_output << std::endl;
 		m_param->msg.set_details("unknown serial output: " + m_output);
 		terminateExperiment(m_param->msg.UNKNOWN);