make 2 more fields of k:r:Cpu protected (should be private)

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 8b66b85..f041d8a 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -10,6 +10,7 @@
 #include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/trace_mgr.hpp"
 
 #include <list>
 
@@ -26,6 +27,8 @@ namespace surf {
  */
 class XBT_PUBLIC CpuModel : public kernel::resource::Model {
 public:
+  explicit CpuModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {}
+
   /**
    * @brief Create a Cpu
    *
@@ -35,8 +38,8 @@ public:
    */
   virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)=0;
 
-  void updateActionsStateLazy(double now, double delta) override;
-  void updateActionsStateFull(double now, double delta) override;
+  void update_actions_state_lazy(double now, double delta) override;
+  void update_actions_state_full(double now, double delta) override;
 };
 
 /************
@@ -100,7 +103,7 @@ public:
   virtual simgrid::kernel::resource::Action* sleep(double duration) = 0;
 
   /** @brief Get the amount of cores */
-  virtual int coreCount();
+  virtual int get_cores_count();
 
   /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
   virtual double getSpeed(double load);
@@ -111,27 +114,36 @@ protected:
 
 public:
   /** @brief Get the available speed of the current Cpu */
-  virtual double getAvailableSpeed();
+  virtual double get_available_speed();
 
   /** @brief Get the current Cpu computational speed */
   virtual double getPstateSpeed(int pstate_index);
 
-  virtual int getNbPStates();
-  virtual void setPState(int pstate_index);
-  virtual int  getPState();
+  virtual int get_pstates_count();
+  virtual void set_pstate(int pstate_index);
+  virtual int get_pstate();
 
-  simgrid::s4u::Host* getHost() { return host_; }
+  simgrid::s4u::Host* get_host() { return host_; }
 
-  int coresAmount_ = 1;
+private:
+  int cores_count_ = 1;
   simgrid::s4u::Host* host_;
 
-  std::vector<double> speedPerPstate_; /*< List of supported CPU capacities (pstate related) */
   int pstate_ = 0;                     /*< Current pstate (index in the speedPeakList)*/
+  std::vector<double> speed_per_pstate_; /*< List of supported CPU capacities (pstate related) */
 
-  virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */
-  virtual void setSpeedTrace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */
+public:
+  /** @brief Setup the trace file with states events (ON or OFF).
+   * Trace must contain boolean values (0 or 1).
+   */
+  virtual void setStateTrace(tmgr_trace_t trace);
+  /*< @brief Setup the trace file with availability events (peak speed changes due to external load).
+   * Trace must contain relative values (ratio between 0 and 1)
+   */
+  virtual void set_speed_trace(tmgr_trace_t trace);
 
-  tmgr_trace_event_t stateEvent_ = nullptr;
+protected:
+  tmgr_trace_event_t state_event_ = nullptr;
   Metric speed_                  = {1.0, 0, nullptr};
 };
 
@@ -165,7 +177,7 @@ public:
 
   void update_remains_lazy(double now) override;
   std::list<Cpu*> cpus();
-  
+
   void suspend() override;
   void resume() override;
 };