From 8095335bf30e7c43628e1dec84f8eeb2b36b0f55 Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Tue, 3 Apr 2012 14:05:12 +0000
Subject: [PATCH] moving terminate() to SimulatorController

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1017 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
 core/SAL/SimulatorController.cc    | 8 ++++++++
 core/SAL/SimulatorController.hpp   | 2 +-
 core/SAL/bochs/BochsController.cc  | 8 --------
 core/SAL/bochs/BochsController.hpp | 6 ------
 core/SAL/ovp/Controller.cc         | 4 ----
 core/SAL/ovp/OVPController.hpp     | 5 -----
 6 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/core/SAL/SimulatorController.cc b/core/SAL/SimulatorController.cc
index 85e70256..11c20944 100644
--- a/core/SAL/SimulatorController.cc
+++ b/core/SAL/SimulatorController.cc
@@ -282,4 +282,12 @@ T* SimulatorController::getExperimentData()
 	return (concreteExpDat);
 }
 
+void SimulatorController::terminate(int exCode)
+{
+	// Attention: This could cause problems, e.g., because of non-closed sockets
+	std::cout << "[FAIL] Exit called by experiment with exit code: " << exCode << std::endl;
+	// TODO: (Non-)Verbose-Mode?
+	exit(exCode);
+}
+
 } // end-of-namespace: sal
diff --git a/core/SAL/SimulatorController.hpp b/core/SAL/SimulatorController.hpp
index 5189d961..9870e9e4 100644
--- a/core/SAL/SimulatorController.hpp
+++ b/core/SAL/SimulatorController.hpp
@@ -139,7 +139,7 @@ class SimulatorController
 		 * Terminate simulator
 		 * @param exCode Individual exit code
 		 */
-		virtual void terminate(int exCode = EXIT_SUCCESS) = 0;
+		virtual void terminate(int exCode = EXIT_SUCCESS);
 		/**
 		 * Check whether the interrupt should be suppressed.
 		 * @param interruptNum the interrupt-type id
diff --git a/core/SAL/bochs/BochsController.cc b/core/SAL/bochs/BochsController.cc
index fccb943e..d1e34a7c 100644
--- a/core/SAL/bochs/BochsController.cc
+++ b/core/SAL/bochs/BochsController.cc
@@ -170,14 +170,6 @@ void BochsController::rebootDone()
 	m_Flows.toggle(m_CurrFlow);
 }
 
-void BochsController::terminate(int exCode)
-{
-	// Attention: This could cause Problems, e.g. because of non-closed sockets
-	std::cout << "[FAIL] Exit called by experiment with exit code: " << exCode << std::endl;
-	// TODO: (Non-)Verbose-Mode?
-	exit(exCode);
-}
-
 void BochsController::fireInterrupt(unsigned irq)
 {
 	interrupt_injection_request = true;
diff --git a/core/SAL/bochs/BochsController.hpp b/core/SAL/bochs/BochsController.hpp
index 284006d3..9d151a57 100644
--- a/core/SAL/bochs/BochsController.hpp
+++ b/core/SAL/bochs/BochsController.hpp
@@ -8,7 +8,6 @@
 #include <iostream>
 #include <iomanip>
 #include <string.h>
-#include <stdlib.h>
 
 #include "failbochs.hpp"
 
@@ -87,11 +86,6 @@ class BochsController : public SimulatorController
 		 * Reboot finished: Callback from Simulator
 		 */
 		void rebootDone();
-		/**
-		 * Terminate simulator
-		 * @param exCode Individual exit code
-		 */
-		void terminate(int exCode = EXIT_SUCCESS);
 		/**
 		 * Fire an interrupt.
 		 * @param irq Interrupt to be fired
diff --git a/core/SAL/ovp/Controller.cc b/core/SAL/ovp/Controller.cc
index d7b9f13e..d3a084eb 100644
--- a/core/SAL/ovp/Controller.cc
+++ b/core/SAL/ovp/Controller.cc
@@ -127,10 +127,6 @@ void OVPController::toPreviousCtx()
 	// TODO
 }
 
-void OVPController::terminate(int exCode){
-
-}
-
 
 void OVPController::fireTimer(uint32_t){
 
diff --git a/core/SAL/ovp/OVPController.hpp b/core/SAL/ovp/OVPController.hpp
index 5c850492..d0d77009 100644
--- a/core/SAL/ovp/OVPController.hpp
+++ b/core/SAL/ovp/OVPController.hpp
@@ -66,11 +66,6 @@ class OVPController : public SimulatorController
 		 * @return the current eip
 		 */
 
-		/**
-		 * Terminate simulator
-		 */
-		 virtual void terminate(int exCode = EXIT_SUCCESS);
-
 		 virtual void fireTimer(uint32_t);		 
 
 		 void makeGPRegister(int, void*, const string&);