Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
simplify the prototype of CpuAction::onStateChange
[simgrid.git] / src / surf / cpu_interface.cpp
index a8d80c7..5b31783 100644 (file)
@@ -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"
 
@@ -30,13 +31,7 @@ Cpu *getActionCpu(CpuAction *action) {
                                         action->getVariable(), 0)));
 }
 
-surf_callback(void, Cpu*) cpuCreatedCallbacks;
-surf_callback(void, Cpu*) cpuDestructedCallbacks;
-surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks;
-surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks;
-void cpu_add_traces(){
-  surf_cpu_model_pm->addTraces();
-}
+simgrid::xbt::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
 
 /*********
  * Model *
@@ -132,31 +127,38 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-Cpu::Cpu()
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host,
+            xbt_dynar_t speedPeakList, int pstate,
+                int core, double speedPeak, double speedScale,
+                int initiallyOn)
+ : Cpu(model, host, NULL/*constraint*/, speedPeakList, pstate, core, speedPeak, speedScale, initiallyOn)
 {
 }
 
-
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-         int core, double speedPeak, double speedScale,
-         e_surf_resource_state_t stateInitial)
- : Resource(model, name, props, stateInitial)
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
+             xbt_dynar_t speedPeakList, int pstate,
+                 int core, double speedPeak,
+        double speedScale, int initiallyOn)
+ : Resource(model, host->name().c_str(), constraint, initiallyOn)
  , m_core(core)
  , m_speedPeak(speedPeak)
  , m_speedScale(speedScale)
+ , m_host(host)
 {
+  host->pimpl_cpu = this;
+  xbt_assert(m_speedScale > 0, "Available speed has to be >0");
+
+  // 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, const char *name, xbt_dict_t props,
-        lmm_constraint_t constraint, int core, double speedPeak,
-        double speedScale, e_surf_resource_state_t stateInitial)
- : Resource(model, name, props, constraint, stateInitial)
- , m_core(core)
- , m_speedPeak(speedPeak)
- , m_speedScale(speedScale)
-{
-  /* At now, we assume that a VM does not have a multicore CPU. */
+  /* Currently, we assume that a VM does not have a multicore CPU. */
   if (core > 1)
     xbt_assert(model == surf_cpu_model_pm);
 
@@ -167,24 +169,14 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
     int i;
     for (i = 0; i < core; i++) {
       /* just for a unique id, never used as a string. */
-      p_constraintCoreId[i] = bprintf("%s:%i", name, i);
+      p_constraintCoreId[i] = bprintf("%s:%i", host->name().c_str(), i);
       p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak);
     }
   }
 }
 
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-  lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
-: Cpu(model, name, props, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{}
-
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-  int core, double speedPeak, double speedScale)
-: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{}
-
-Cpu::~Cpu(){
-  surf_callback_emit(cpuDestructedCallbacks, this);
+Cpu::~Cpu()
+{
   if (p_constraintCoreId){
     for (int i = 0; i < m_core; i++) {
          xbt_free(p_constraintCoreId[i]);
@@ -200,6 +192,37 @@ 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;
+
+  onSpeedChange();
+}
+
+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;
@@ -211,16 +234,15 @@ double Cpu::getAvailableSpeed()
   return m_speedScale;
 }
 
-int Cpu::getCore()
-{
-  return m_core;
+void Cpu::onSpeedChange() {
+       TRACE_surf_host_set_speed(surf_get_clock(), getName(),
+                       m_core * m_speedScale * m_speedPeak);
 }
 
-void Cpu::setState(e_surf_resource_state_t state)
+
+int Cpu::getCore()
 {
-  e_surf_resource_state_t old = Resource::getState();
-  Resource::setState(state);
-  surf_callback_emit(cpuStateChangedCallbacks, this, old, state);
+  return m_core;
 }
 
 /**********
@@ -323,10 +345,12 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask)
   XBT_OUT();
 }
 
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> CpuAction::onStateChange;
+
 void CpuAction::setState(e_surf_action_state_t state){
-  e_surf_action_state_t old = getState();
+  e_surf_action_state_t previous = getState();
   Action::setState(state);
-  surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state);
+  onStateChange(this, previous);
 }
 
 }