Merge remote-tracking branch 'github/master'

[simgrid.git] / src / surf / cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index df6c050..014789a 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -3,15 +3,13 @@
 /* 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 <boost/intrusive/list.hpp>
-
-#include <xbt/base.h>
+#ifndef SURF_MODEL_CPUTI_H_
+#define SURF_MODEL_CPUTI_H_
 
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
-/* Epsilon */
-#define EPSILON 0.000000001
+#include <boost/intrusive/list.hpp>
 
 namespace simgrid {
 namespace surf {
@@ -28,6 +26,8 @@ class XBT_PRIVATE CpuTi;
 class CpuTiTrace {
 public:
   explicit CpuTiTrace(tmgr_trace_t speedTrace);
+  CpuTiTrace(const CpuTiTrace&) = delete;
+  CpuTiTrace& operator=(const CpuTiTrace&) = delete;
   ~CpuTiTrace();
 
   double integrate_simple(double a, double b);
@@ -40,25 +40,25 @@ public:
   int binary_search(double* array, double a, int low, int high);
 };
 
-enum trace_type {
-
-  TRACE_FIXED,                /*< Trace fixed, no availability file */
-  TRACE_DYNAMIC               /*< Dynamic, have an availability file */
-};
+class CpuTiTmgr {
+  enum class Type {
+    FIXED,  /*< Trace fixed, no availability file */
+    DYNAMIC /*< Dynamic, have an availability file */
+  };
 
-class CpuTiTgmr {
 public:
-  CpuTiTgmr(trace_type type, double value)
-    : type_(type), value_(value)
-  {};
-  CpuTiTgmr(tmgr_trace_t speedTrace, double value);
-  ~CpuTiTgmr();
+  explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){};
+  CpuTiTmgr(tmgr_trace_t speed_trace, double value);
+  CpuTiTmgr(const CpuTiTmgr&) = delete;
+  CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
+  ~CpuTiTmgr();
 
   double integrate(double a, double b);
   double solve(double a, double amount);
   double get_power_scale(double a);
 
-  trace_type type_;
+private:
+  Type type_;
   double value_;                 /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
@@ -73,13 +73,13 @@ public:
  * Action *
  **********/
 
-class CpuTiAction: public CpuAction {
+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;
@@ -111,23 +111,21 @@ public:
 
   bool is_used() override;
   CpuAction *execution_start(double size) override;
-  simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+  simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override
   {
     THROW_UNIMPLEMENTED;
     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;
 };
 
@@ -139,15 +137,18 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  CpuTiModel() : CpuModel(Model::UpdateAlgo::Full){};
+  static void create_pm_vm_models(); // Make both models be TI models
+
+  CpuTiModel();
   ~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_;
 };
 
 }
 }
+
+#endif /* SURF_MODEL_CPUTI_H_ */