X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1cd245755b7bf835067aba4fde87a4c6bb63ae07..c6a53c1ab614ef61d7daab42c65ab296df276cb5:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index f42b6ea0e0..57515468ab 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -48,15 +48,13 @@ enum trace_type {
   TRACE_DYNAMIC               /*< Dynamic, have an availability file */
 };
 
-class CpuTiTgmr {
+class CpuTiTmgr {
 public:
-  CpuTiTgmr(trace_type type, double value)
-    : type_(type), value_(value)
-  {};
-  CpuTiTgmr(tmgr_trace_t speedTrace, double value);
-  CpuTiTgmr(const CpuTiTgmr&) = delete;
-  CpuTiTgmr& operator=(const CpuTiTgmr&) = delete;
-  ~CpuTiTgmr();
+  CpuTiTmgr(trace_type type, double value) : type_(type), value_(value){};
+  CpuTiTmgr(tmgr_trace_t speedTrace, double value);
+  CpuTiTmgr(const CpuTiTmgr&) = delete;
+  CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
+  ~CpuTiTmgr();
 
   double integrate(double a, double b);
   double solve(double a, double amount);
@@ -80,10 +78,10 @@ public:
 class XBT_PRIVATE CpuTiAction : public CpuAction {
   friend class CpuTi;
 public:
-  CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
+  CpuTiAction(CpuTi* cpu, double cost);
   ~CpuTiAction();
 
-  void set_state(simgrid::kernel::resource::Action::State state) override;
+  void set_state(kernel::resource::Action::State state) override;
   void cancel() override;
   void suspend() override;
   void resume() override;
@@ -121,17 +119,15 @@ public:
     return nullptr;
   }
   CpuAction *sleep(double duration) override;
-  double get_available_speed() override;
+  double get_speed_ratio() override;
 
   void set_modified(bool modified);
 
-  CpuTiTgmr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */
+  CpuTiTmgr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */
   ActionTiList action_set_;                     /*< set with all actions running on cpu */
   double sum_priority_ = 0;                  /*< the sum of actions' priority that are running on cpu */
   double last_update_  = 0;                  /*< last update of actions' remaining amount done */
 
-  double current_frequency_;
-
   boost::intrusive::list_member_hook<> cpu_ti_hook;
 };
 
@@ -143,13 +139,12 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  CpuTiModel() : CpuModel(Model::UpdateAlgo::Full){};
+  CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL){};
   ~CpuTiModel() override;
-  Cpu* createCpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+  Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
   double next_occuring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 
-  kernel::resource::Action::StateSet runningActionSetThatDoesNotNeedBeingChecked_;
   CpuTiList modified_cpus_;
 };