X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2d941a9e68e4389cd4148ccbe1cb35da63e54e4..8dadf249202bc6834a1d680b8ec8446937b3c4a6:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 0bb5ed6219..1b843c0253 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -4,6 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/dynar.h>
 #include "cpu_interface.hpp"
 #include "plugins/energy.hpp"
 
@@ -20,14 +21,6 @@ simgrid::surf::CpuModel *surf_cpu_model_vm;
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::Extension<simgrid::Host, Cpu> Cpu::EXTENSION_ID;
-
-void Cpu::classInit()
-{
-  if (!EXTENSION_ID.valid())
-    EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Cpu>();
-}
-
 /*************
  * Callbacks *
  *************/
@@ -144,7 +137,8 @@ Cpu::Cpu()
 
 
 Cpu::Cpu(Model *model, simgrid::Host *host,
-         int core, double speedPeak, double speedScale,
+	     xbt_dynar_t speedPeakList, int pstate,
+		 int core, double speedPeak, double speedScale,
          e_surf_resource_state_t stateInitial)
  : Resource(model, host->getName().c_str(), stateInitial)
  , m_core(core)
@@ -152,11 +146,22 @@ Cpu::Cpu(Model *model, simgrid::Host *host,
  , m_speedScale(speedScale)
  , m_host(host)
 {
-  host->extension_set(Cpu::EXTENSION_ID, this);
+  host->p_cpu = this;
+
+  // Copy the power peak array:
+  p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr);
+  unsigned long n = xbt_dynar_length(speedPeakList);
+  for (unsigned long i = 0; i != n; ++i) {
+    double value = xbt_dynar_get_as(speedPeakList, i, double);
+    xbt_dynar_push(p_speedPeakList, &value);
+  }
+
+  m_pstate = pstate;
 }
 
-Cpu::Cpu(Model *model, simgrid::Host *host,
-        lmm_constraint_t constraint, int core, double speedPeak,
+Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
+	      xbt_dynar_t speedPeakList, int pstate,
+		  int core, double speedPeak,
         double speedScale, e_surf_resource_state_t stateInitial)
  : Resource(model, host->getName().c_str(), constraint, stateInitial)
  , m_core(core)
@@ -164,7 +169,18 @@ Cpu::Cpu(Model *model, simgrid::Host *host,
  , m_speedScale(speedScale)
  , m_host(host)
 {
-  host->extension_set(Cpu::EXTENSION_ID, this);
+  host->p_cpu = this;
+
+  // Copy the power peak array:
+  p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr);
+  unsigned long n = xbt_dynar_length(speedPeakList);
+  for (unsigned long i = 0; i != n; ++i) {
+    double value = xbt_dynar_get_as(speedPeakList, i, double);
+    xbt_dynar_push(p_speedPeakList, &value);
+  }
+
+  m_pstate = pstate;
+
   /* Currently, we assume that a VM does not have a multicore CPU. */
   if (core > 1)
     xbt_assert(model == surf_cpu_model_pm);
@@ -182,14 +198,18 @@ Cpu::Cpu(Model *model, simgrid::Host *host,
   }
 }
 
-Cpu::Cpu(Model *model, simgrid::Host *host,
-  lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
-: Cpu(model, host, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{}
+Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
+  xbt_dynar_t speedPeakList, int pstate,
+  int core, double speedPeak, double speedScale)
+: Cpu(model, host, constraint, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+{
+	xbt_assert(0,"FIXME: this constructor could be removed");
+}
 
 Cpu::Cpu(Model *model, simgrid::Host *host,
+  xbt_dynar_t speedPeakList, int pstate,
   int core, double speedPeak, double speedScale)
-: Cpu(model, host, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+: Cpu(model, host, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
 {}
 
 Cpu::~Cpu()
@@ -209,6 +229,35 @@ double Cpu::getCurrentPowerPeak()
   return m_speedPeak;
 }
 
+int Cpu::getNbPStates()
+{
+  return xbt_dynar_length(p_speedPeakList);
+}
+
+void Cpu::setPState(int pstate_index)
+{
+  xbt_dynar_t plist = p_speedPeakList;
+  xbt_assert(pstate_index <= (int)xbt_dynar_length(plist),
+		  "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index, (int)xbt_dynar_length(plist));
+
+  double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double);
+  m_pstate = pstate_index;
+  m_speedPeak = new_peak_speed;
+}
+
+int Cpu::getPState()
+{
+  return m_pstate;
+}
+
+double Cpu::getPowerPeakAt(int pstate_index)
+{
+  xbt_dynar_t plist = p_speedPeakList;
+  xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
+
+  return xbt_dynar_get_as(plist, pstate_index, double);
+}
+
 double Cpu::getSpeed(double load)
 {
   return load * m_speedPeak;