X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/004f590018709991ab87a1f113c9b80d1cb17318..1e5ef63ac93fa2b2a79a1f53866c06e549ecd7d0:/src/surf/cpu_cas01.cpp

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 1b9f80d3f9..5c6f2dceb7 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2011, 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -56,7 +55,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
   maxminSystem_ = new simgrid::kernel::lmm::System(selectiveUpdate_);
 
   if (getUpdateMechanism() == UM_LAZY) {
-    modifiedSet_ = new ActionLmmList();
+    modifiedSet_              = new kernel::resource::ActionLmmList();
     maxminSystem_->keep_track = modifiedSet_;
   }
 }
@@ -97,7 +96,7 @@ bool CpuCas01::isUsed()
 
 /** @brief take into account changes of speed (either load or max) */
 void CpuCas01::onSpeedChange() {
-  lmm_variable_t var       = nullptr;
+  kernel::lmm::Variable* var = nullptr;
   const_lmm_element_t elem = nullptr;
 
   model()->getMaxminSystem()->update_constraint_bound(constraint(), coresAmount_ * speed_.scale * speed_.peak);
@@ -130,21 +129,21 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
         host_that_restart.push_back(getHost());
       turnOn();
     } else {
-      lmm_constraint_t cnst    = constraint();
-      lmm_variable_t var       = nullptr;
+      kernel::lmm::Constraint* cnst = constraint();
+      kernel::lmm::Variable* var    = nullptr;
       const_lmm_element_t elem = nullptr;
       double date              = surf_get_clock();
 
       turnOff();
 
       while ((var = cnst->get_variable(&elem))) {
-        Action* action = static_cast<Action*>(var->get_id());
+        kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
 
-        if (action->getState() == Action::State::running ||
-            action->getState() == Action::State::ready ||
-            action->getState() == Action::State::not_in_the_system) {
+        if (action->getState() == kernel::resource::Action::State::running ||
+            action->getState() == kernel::resource::Action::State::ready ||
+            action->getState() == kernel::resource::Action::State::not_in_the_system) {
           action->setFinishTime(date);
-          action->setState(Action::State::failed);
+          action->setState(kernel::resource::Action::State::failed);
         }
       }
     }
@@ -156,10 +155,11 @@ void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
 }
 
 /** @brief Start a new execution on this CPU lasting @param size flops and using one core */
-CpuAction *CpuCas01::execution_start(double size)
+CpuAction* CpuCas01::execution_start(double size)
 {
   return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint());
 }
+
 CpuAction* CpuCas01::execution_start(double size, int requestedCores)
 {
   return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint(), requestedCores);
@@ -175,7 +175,7 @@ CpuAction *CpuCas01::sleep(double duration)
 
   // FIXME: sleep variables should not consume 1.0 in System::expand()
   action->setMaxDuration(duration);
-  action->suspended_ = 2;
+  action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
   if (duration < 0) { // NO_MAX_DURATION
     /* Move to the *end* of the corresponding action set. This convention is used to speed up update_resource_state */
     simgrid::xbt::intrusive_erase(*action->getStateSet(), *action);
@@ -198,8 +198,8 @@ CpuAction *CpuCas01::sleep(double duration)
 /**********
  * Action *
  **********/
-CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint,
-                               int requestedCore)
+CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+                               kernel::lmm::Constraint* constraint, int requestedCore)
     : CpuAction(model, cost, failed,
                 model->getMaxminSystem()->variable_new(this, 1.0 / requestedCore, requestedCore * speed, 1))
     , requestedCore_(requestedCore)
@@ -211,7 +211,8 @@ CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp
   model->getMaxminSystem()->expand(constraint, getVariable(), 1.0);
 }
 
-CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint)
+CpuCas01Action::CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+                               kernel::lmm::Constraint* constraint)
     : CpuCas01Action(model, cost, failed, speed, constraint, 1)
 {
 }