From cc5c5a7eac0ebcf97c283e1e0dd1674c855a261a Mon Sep 17 00:00:00 2001
From: Matthijs Bijman <matthijs@bijman.org>
Date: Mon, 27 Feb 2017 13:55:50 +0100
Subject: Implement logging of cores_used in task_states

---
 Simulator/src/modeling/machine/CPU.cpp     | 8 ++++----
 Simulator/src/modeling/machine/Machine.cpp | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'Simulator/src/modeling')

diff --git a/Simulator/src/modeling/machine/CPU.cpp b/Simulator/src/modeling/machine/CPU.cpp
index 6167b133..0caa34ec 100644
--- a/Simulator/src/modeling/machine/CPU.cpp
+++ b/Simulator/src/modeling/machine/CPU.cpp
@@ -4,22 +4,22 @@ namespace Modeling
 {
 	CPU::CPU(int speed, int cores, int energyConsumption, int failureModelId) : speed(speed), cores(cores), energyConsumption(energyConsumption), failureModelId(failureModelId) {}
 
-	int CPU::getCores()
+	int CPU::getCores() const
 	{
 		return this->cores;
 	}
 
-	int CPU::getEnergyConsumption()
+	int CPU::getEnergyConsumption() const
 	{
 		return this->energyConsumption;
 	}
 
-	int CPU::getFailureModelId()
+	int CPU::getFailureModelId() const
 	{
 		return this->failureModelId;
 	}
 
-	int CPU::getSpeed()
+	int CPU::getSpeed() const
 	{
 		return this->speed;
 	}
diff --git a/Simulator/src/modeling/machine/Machine.cpp b/Simulator/src/modeling/machine/Machine.cpp
index d7d4fac7..db336dd8 100644
--- a/Simulator/src/modeling/machine/Machine.cpp
+++ b/Simulator/src/modeling/machine/Machine.cpp
@@ -77,4 +77,13 @@ namespace Modeling
 	{
 		return this->load;
 	}
+
+	uint32_t Machine::getNumberOfCores() const
+	{
+		uint32_t cores = 0;
+		for (auto& processor : cpus) {
+			cores += processor.getCores();
+		}
+		return cores;
+	}
 }
-- 
cgit v1.2.3