X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0617119206ff65bfdad4e484f653638abbc3c747..6bffab333103f7f6c28905966b69889ae32b2d0f:/src/surf/cpu_cas01.cpp

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index d03c3c09f1..57eb37e1bd 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -4,13 +4,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_cas01.hpp"
-#include "cpu_ti.hpp"
 #include "simgrid/sg_config.hpp"
-#include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/config.hpp"
-#include "xbt/utility.hpp"
-
-#include <algorithm>
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module");
 
@@ -64,10 +60,10 @@ namespace surf {
 
 CpuCas01Model::CpuCas01Model(kernel::resource::Model::UpdateAlgo algo) : simgrid::surf::CpuModel(algo)
 {
-  bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
+  bool select = simgrid::config::get_value<bool>("cpu/maxmin-selective-update");
 
   if (algo == Model::UpdateAlgo::Lazy) {
-    xbt_assert(select || xbt_cfg_is_default_value("cpu/maxmin-selective-update"),
+    xbt_assert(select || simgrid::config::is_default("cpu/maxmin-selective-update"),
                "You cannot disable cpu selective update when using the lazy update mechanism");
     select = true;
   }
@@ -112,7 +108,7 @@ bool CpuCas01::is_used()
 /** @brief take into account changes of speed (either load or max) */
 void CpuCas01::onSpeedChange() {
   kernel::lmm::Variable* var = nullptr;
-  const_lmm_element_t elem = nullptr;
+  const kernel::lmm::Element* elem = nullptr;
 
   get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
                                                             coresAmount_ * speed_.scale * speed_.peak);
@@ -120,7 +116,7 @@ void CpuCas01::onSpeedChange() {
     CpuCas01Action* action = static_cast<CpuCas01Action*>(var->get_id());
 
     get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
-                                                            action->requestedCore() * speed_.scale * speed_.peak);
+                                                            action->requested_core() * speed_.scale * speed_.peak);
   }
 
   Cpu::onSpeedChange();
@@ -147,7 +143,7 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
     } else {
       kernel::lmm::Constraint* cnst = get_constraint();
       kernel::lmm::Variable* var    = nullptr;
-      const_lmm_element_t elem = nullptr;
+      const kernel::lmm::Element* elem = nullptr;
       double date              = surf_get_clock();
 
       turn_off();
@@ -176,9 +172,9 @@ CpuAction* CpuCas01::execution_start(double size)
   return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint());
 }
 
-CpuAction* CpuCas01::execution_start(double size, int requestedCores)
+CpuAction* CpuCas01::execution_start(double size, int requested_cores)
 {
-  return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requestedCores);
+  return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores);
 }
 
 CpuAction *CpuCas01::sleep(double duration)
@@ -215,27 +211,25 @@ CpuAction *CpuCas01::sleep(double duration)
  * Action *
  **********/
 CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
-                               kernel::lmm::Constraint* constraint, int requestedCore)
+                               kernel::lmm::Constraint* constraint, int requested_core)
     : CpuAction(model, cost, failed,
-                model->get_maxmin_system()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1))
-    , requestedCore_(requestedCore)
+                model->get_maxmin_system()->variable_new(this, 1.0 / requested_core, requested_core * speed, 1))
+    , requested_core_(requested_core)
 {
-  if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) {
+  if (model->get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy)
     set_last_update();
-    set_last_value(0.0);
-  }
   model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
 }
 
 CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
                                kernel::lmm::Constraint* constraint)
-    : CpuCas01Action(model, cost, failed, speed, constraint, 1)
+    : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1)
 {
 }
 
-int CpuCas01Action::requestedCore()
+int CpuCas01Action::requested_core()
 {
-  return requestedCore_;
+  return requested_core_;
 }
 
 CpuCas01Action::~CpuCas01Action()=default;