mv NetworkAction::rate_ to Action::user_bound_

[simgrid.git] / src / surf / cpu_cas01.cpp

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 02d4abb..ee3430c 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -78,22 +78,14 @@ CpuCas01Model::~CpuCas01Model()
   surf_cpu_model_pm = nullptr;
 }
 
-Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+Cpu* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
 {
-  return new CpuCas01(this, host, speed_per_pstate, core);
+  return (new CpuCas01(host, speed_per_pstate))->set_model(this);
 }
 
 /************
  * Resource *
  ************/
-CpuCas01::CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
-    : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, core * speed_per_pstate.front()),
-          speed_per_pstate, core)
-{
-}
-
-CpuCas01::~CpuCas01() = default;
-
 bool CpuCas01::is_used() const
 {
   return get_model()->get_maxmin_system()->constraint_used(get_constraint());
@@ -133,8 +125,8 @@ void CpuCas01::apply_event(profile::Event* event, double value)
 
     if (value > 0) {
       if (not is_on()) {
-        XBT_VERB("Restart actors on host %s", get_host()->get_cname());
-        get_host()->turn_on();
+        XBT_VERB("Restart actors on host %s", get_iface()->get_cname());
+        get_iface()->turn_on();
       }
     } else {
       const lmm::Constraint* cnst = get_constraint();
@@ -142,7 +134,7 @@ void CpuCas01::apply_event(profile::Event* event, double value)
       const lmm::Element* elem = nullptr;
       double date              = surf_get_clock();
 
-      get_host()->turn_off();
+      get_iface()->turn_off();
 
       while ((var = cnst->get_variable(&elem))) {
         Action* action = var->get_id();
@@ -213,11 +205,6 @@ CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp
   model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
 }
 
-CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint)
-    : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1)
-{
-}
-
 int CpuCas01Action::requested_core() const
 {
   return requested_core_;