X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a3a100990355eb757dc81106b5aac6daed0b8e1..eecf563b3a3a0333dac9f754fe11f047c99cd27d:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 5ce1af9fc7..a4f918404a 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -19,13 +19,8 @@ namespace surf {
 /***********
  * Classes *
  ***********/
-class XBT_PRIVATE CpuTiTrace;
-class XBT_PRIVATE CpuTiTgmr;
 class XBT_PRIVATE CpuTiModel;
 class XBT_PRIVATE CpuTi;
-class XBT_PRIVATE CpuTiAction;
-
-struct tiTag;
 
 /*********
  * Trace *
@@ -33,16 +28,18 @@ struct tiTag;
 class CpuTiTrace {
 public:
   explicit CpuTiTrace(tmgr_trace_t speedTrace);
+  CpuTiTrace(const CpuTiTrace&) = delete;
+  CpuTiTrace& operator=(const CpuTiTrace&) = delete;
   ~CpuTiTrace();
 
-  double integrateSimple(double a, double b);
-  double integrateSimplePoint(double a);
-  double solveSimple(double a, double amount);
+  double integrate_simple(double a, double b);
+  double integrate_simple_point(double a);
+  double solve_simple(double a, double amount);
 
-  double *timePoints_;
+  double* time_points_;
   double *integral_;
-  int nbPoints_;
-  int binarySearch(double *array, double a, int low, int high);
+  int nb_points_;
+  int binary_search(double* array, double a, int low, int high);
 };
 
 enum trace_type {
@@ -51,47 +48,46 @@ 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();
+  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);
-  double solveSomewhatSimple(double a, double amount);
-  double getPowerScale(double a);
+  double get_power_scale(double a);
 
   trace_type type_;
   double value_;                 /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
-  double lastTime_ = 0.0;             /*< Integral interval last point (discrete time) */
+  double last_time_ = 0.0;             /*< Integral interval last point (discrete time) */
   double total_    = 0.0;             /*< Integral total between 0 and last_pointn */
 
   CpuTiTrace *trace_ = nullptr;
-  tmgr_trace_t speedTrace_ = nullptr;
+  tmgr_trace_t speed_trace_ = nullptr;
 };
 
 /**********
  * 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 setState(simgrid::kernel::resource::Action::State state) override;
-  int unref() override;
+  void set_state(kernel::resource::Action::State state) override;
   void cancel() override;
   void suspend() override;
   void resume() override;
-  void setMaxDuration(double duration) override;
-  void setSharingWeight(double priority) override;
-  double getRemains() override;
+  void set_max_duration(double duration) override;
+  void set_priority(double priority) override;
+  double get_remains() override;
 
   CpuTi *cpu_;
 
@@ -106,16 +102,16 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+  CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
   ~CpuTi() override;
 
-  void setSpeedTrace(tmgr_trace_t trace) override;
+  void set_speed_trace(tmgr_trace_t trace) override;
 
   void apply_event(tmgr_trace_event_t event, double value) override;
-  void updateActionsFinishTime(double now);
-  void updateRemainingAmount(double now);
+  void update_actions_finish_time(double now);
+  void update_remaining_amount(double now);
 
-  bool isUsed() override;
+  bool is_used() override;
   CpuAction *execution_start(double size) override;
   simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
   {
@@ -123,16 +119,14 @@ public:
     return nullptr;
   }
   CpuAction *sleep(double duration) override;
-  double getAvailableSpeed() override;
-
-  void modified(bool modified);
+  double get_available_speed() override;
 
-  CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
-  ActionTiList actionSet_;                   /*< set with all actions running on cpu */
-  double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
-  double lastUpdate_ = 0;  /*< last update of actions' remaining amount done */
+  void set_modified(bool modified);
 
-  double currentFrequency_;
+  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 */
 
   boost::intrusive::list_member_hook<> cpu_ti_hook;
 };
@@ -145,14 +139,13 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  CpuTiModel() = default;
+  CpuTiModel() : CpuModel(Model::UpdateAlgo::Full){};
   ~CpuTiModel() override;
-  Cpu *createCpu(simgrid::s4u::Host *host,  std::vector<double>* speedPerPstate, int core) override;
-  double nextOccuringEvent(double now) override;
-  void updateActionsState(double now, double delta) override;
+  Cpu* createCpu(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::ActionList runningActionSetThatDoesNotNeedBeingChecked_;
-  CpuTiList modifiedCpu_;
+  CpuTiList modified_cpus_;
 };
 
 }