X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fc9b3239f3f2a3a5441fe5c8bac82c1ffa3c9d0..578dd56a4a07709db1922ff5edd98f0c8f3090f9:/src/surf/cpu_cas01.cpp

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 0a7f39155b..24189a472e 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -9,8 +9,7 @@
 #include "maxmin_private.hpp"
 #include "simgrid/sg_config.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu,
-                                "Logging specific to the SURF CPU IMPROVED module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module");
 
 /*********
  * Model *
@@ -20,7 +19,7 @@ void surf_cpu_model_init_Cas01()
   xbt_assert(!surf_cpu_model_pm);
   xbt_assert(!surf_cpu_model_vm);
 
-  char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
+  char *optim = xbt_cfg_get_string("cpu/optim");
   if (!strcmp(optim, "TI")) {
     surf_cpu_model_init_ti();
     return;
@@ -38,8 +37,8 @@ namespace surf {
 
 CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
 {
-  char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
-  int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
+  char *optim = xbt_cfg_get_string("cpu/optim");
+  int select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
 
   if (!strcmp(optim, "Full")) {
     updateMechanism_ = UM_FULL;
@@ -48,9 +47,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
     updateMechanism_ = UM_LAZY;
     selectiveUpdate_ = 1;
     xbt_assert((select == 1)
-               ||
-               (xbt_cfg_is_default_value
-                (_sg_cfg_set, "cpu/maxmin_selective_update")),
+               || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")),
                "Disabling selective update while using the lazy update mechanism is dumb!");
   } else {
     xbt_die("Unsupported optimization (%s) for this model", optim);
@@ -72,9 +69,7 @@ CpuCas01Model::~CpuCas01Model()
 {
   lmm_system_free(maxminSystem_);
   maxminSystem_ = NULL;
-
-  if (actionHeap_)
-    xbt_heap_free(actionHeap_);
+  xbt_heap_free(actionHeap_);
   delete modifiedSet_;
 
   surf_cpu_model_pm = NULL;
@@ -84,9 +79,6 @@ CpuCas01Model::~CpuCas01Model()
 
 Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
 {
-  xbt_assert(xbt_dynar_getfirst_as(speedPerPstate, double) > 0.0,
-      "Speed has to be >0.0. Did you forget to specify the mandatory power attribute?");
-  xbt_assert(core > 0, "Invalid number of cores %d. Must be larger than 0", core);
   return new CpuCas01(this, host, speedPerPstate, core);
 }
 
@@ -101,11 +93,8 @@ double CpuCas01Model::next_occuring_event_full(double /*now*/)
 CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
 : Cpu(model, host,
     lmm_constraint_new(model->getMaxminSystem(), this, core * xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double)),
-    speedPerPstate, core, xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double))
+    speedPerPstate, core)
 {
-  XBT_DEBUG("CPU create: peak=%f, pstate=%d", speed_.peak, pstate_);
-
-  coresAmount_ = core;
 }
 
 CpuCas01::~CpuCas01()
@@ -171,11 +160,11 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value)
       while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) {
         Action *action = static_cast<Action*>(lmm_variable_id(var));
 
-        if (action->getState() == SURF_ACTION_RUNNING ||
-            action->getState() == SURF_ACTION_READY ||
-            action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+        if (action->getState() == Action::State::running ||
+            action->getState() == Action::State::ready ||
+            action->getState() == Action::State::not_in_the_system) {
           action->setFinishTime(date);
-          action->setState(SURF_ACTION_FAILED);
+          action->setState(Action::State::failed);
         }
       }
     }
@@ -206,15 +195,14 @@ CpuAction *CpuCas01::sleep(double duration)
   CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(),
       speed_.scale * speed_.peak, getConstraint());
 
-
   // FIXME: sleep variables should not consume 1.0 in lmm_expand
-  action->m_maxDuration = duration;
-  action->m_suspended = 2;
+  action->maxDuration_ = duration;
+  action->suspended_ = 2;
   if (duration == NO_MAX_DURATION) {
     /* Move to the *end* of the corresponding action set. This convention
        is used to speed up update_resource_state  */
     action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
-    action->p_stateSet = static_cast<CpuCas01Model*>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+    action->stateSet_ = static_cast<CpuCas01Model*>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
     action->getStateSet()->push_back(*action);
   }
 
@@ -242,9 +230,9 @@ CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double sp
          1.0, speed, 1))
 {
   if (model->getUpdateMechanism() == UM_LAZY) {
-    m_indexHeap = -1;
-    m_lastUpdate = surf_get_clock();
-    m_lastValue = 0.0;
+    indexHeap_ = -1;
+    lastUpdate_ = surf_get_clock();
+    lastValue_ = 0.0;
   }
   lmm_expand(model->getMaxminSystem(), constraint, getVariable(), 1.0);
 }