X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/91d1dae3530b50d3897da09435c19f4b0bc27669..d898669283768fdb95c76fc079d7330979e4986f:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 5993c7d0b1..ea5e699774 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -43,8 +43,6 @@ public:
   double *p_integral;
   int m_nbPoints;
   int binarySearch(double *array, double a, int low, int high);
-
-private:
 };
 
 enum trace_type {
@@ -55,7 +53,9 @@ enum trace_type {
 
 class CpuTiTgmr {
 public:
-  CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){};
+  CpuTiTgmr(trace_type type, double value)
+    : m_type(type), m_value(value)
+	{};
   CpuTiTgmr(tmgr_trace_t speedTrace, double value);
   ~CpuTiTgmr();
 
@@ -68,11 +68,11 @@ public:
   double m_value;                 /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
-  double m_lastTime;             /*< Integral interval last point (discrete time) */
-  double m_total;                 /*< Integral total between 0 and last_pointn */
+  double m_lastTime = 0.0;             /*< Integral interval last point (discrete time) */
+  double m_total = 0.0;                 /*< Integral total between 0 and last_pointn */
 
-  CpuTiTrace *p_trace;
-  tmgr_trace_t p_speedTrace;
+  CpuTiTrace *p_trace = nullptr;
+  tmgr_trace_t p_speedTrace = nullptr;
 };
 
 /**********
@@ -85,17 +85,16 @@ public:
   CpuTiAction(CpuTiModel *model, double cost, bool failed,
                    CpuTi *cpu);
 
-  void setState(e_surf_action_state_t state);
-  int unref();
-  void cancel();
+  void setState(e_surf_action_state_t state) override;
+  int unref() override;
+  void cancel() override;
   void updateIndexHeap(int i);
-  void suspend();
-  void resume();
-  bool isSuspended();
-  void setMaxDuration(double duration);
-  void setPriority(double priority);
-  double getRemains();
-  void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) {};
+  void suspend() override;
+  void resume() override;
+  void setMaxDuration(double duration) override;
+  void setPriority(double priority) override;
+  double getRemains() override;
+  void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
 
   CpuTi *p_cpu;
   int m_indexHeap;
@@ -119,27 +118,21 @@ public:
         e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) ;
   ~CpuTi();
 
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
+  void updateState(tmgr_trace_event_t event_type, double value, double date) override;
   void updateActionsFinishTime(double now);
-  bool isUsed();
-  void printCpuTiModel();
-  CpuAction *execute(double size);
-  CpuAction *sleep(double duration);
-  double getAvailableSpeed();
-
-  double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;};
-  double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
-  int getNbPstates() {THROW_UNIMPLEMENTED;};
-  void setPstate(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
-  int  getPstate() { THROW_UNIMPLEMENTED;}
+  bool isUsed() override;
+  CpuAction *execute(double size) override;
+  CpuAction *sleep(double duration) override;
+  double getAvailableSpeed() override;
+
   void modified(bool modified);
 
   CpuTiTgmr *p_availTrace;       /*< Structure with data needed to integrate trace file */
-  tmgr_trace_event_t p_stateEvent;       /*< trace file with states events (ON or OFF) */
-  tmgr_trace_event_t p_speedEvent;       /*< trace file with availability events */
+  tmgr_trace_event_t p_stateEvent = NULL; /*< trace file with states events (ON or OFF) */
+  tmgr_trace_event_t p_speedEvent = NULL; /*< trace file with availability events */
   ActionTiList *p_actionSet;        /*< set with all actions running on cpu */
   double m_sumPriority;          /*< the sum of actions' priority that are running on cpu */
-  double m_lastUpdate;           /*< last update of actions' remaining amount done */
+  double m_lastUpdate = 0;       /*< last update of actions' remaining amount done */
 
   double current_frequency;
 
@@ -164,9 +157,9 @@ public:
                           tmgr_trace_t speedTrace, int core,
                           e_surf_resource_state_t state_initial,
                           tmgr_trace_t state_trace);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  void addTraces();
+  double shareResources(double now) override;
+  void updateActionsState(double now, double delta) override;
+  void addTraces() override;
 
   ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
   CpuTiList *p_modifiedCpu;