X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0c5b1ab11469128ad826610f54b1f0f332bd172..fd2865e1ce63170aba3f6d6dcfe6b007c52e8cba:/src/surf/cpu_cas01.hpp

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 6309e17c75..99cbea69e6 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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. */
 
-#include <xbt/base.h>
-
 #include "cpu_interface.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *
@@ -24,11 +23,11 @@ class XBT_PRIVATE CpuCas01Action;
 
 class CpuCas01Model : public simgrid::surf::CpuModel {
 public:
-  CpuCas01Model();
+  explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
   ~CpuCas01Model() override;
 
   Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
-  ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+  kernel::resource::Action::StateSet cpuRunningActionSetThatDoesNotNeedBeingChecked_;
 };
 
 /************
@@ -40,11 +39,11 @@ public:
   CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
   ~CpuCas01() override;
   void apply_event(tmgr_trace_event_t event, double value) override;
-  CpuAction *execution_start(double size) override;
+  CpuAction* execution_start(double size) override;
   CpuAction* execution_start(double size, int requestedCore) override;
-  CpuAction *sleep(double duration) override;
+  CpuAction* sleep(double duration) override;
 
-  bool isUsed() override;
+  bool is_used() override;
 
   std::vector<double> * getSpeedPeakList(); // FIXME: killme to hide our internals
 
@@ -59,13 +58,15 @@ class CpuCas01Action: public CpuAction {
   friend CpuAction *CpuCas01::execution_start(double size);
   friend CpuAction *CpuCas01::sleep(double duration);
 public:
-  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint, int coreAmount);
-  CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint);
+  CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+                 kernel::lmm::Constraint* constraint, int coreAmount);
+  CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+                 kernel::lmm::Constraint* constraint);
   ~CpuCas01Action() override;
-  int requestedCore();
+  int requested_core();
 
 private:
-  int requestedCore_ = 1;
+  int requested_core_ = 1;
 };
 
 }