snake_case k:r:CpuModel and sub-classes

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 26f76ac..73f12a1 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -36,7 +36,7 @@ public:
    * @param speedPerPstate Processor speed (in Flops) of each pstate. This ignores any potential external load coming from a trace.
    * @param core The number of core of this Cpu
    */
-  virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)=0;
+  virtual Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speedPerPstate, int core) = 0;
 
   void update_actions_state_lazy(double now, double delta) override;
   void update_actions_state_full(double now, double delta) override;
@@ -130,15 +130,19 @@ private:
   simgrid::s4u::Host* host_;
 
   int pstate_ = 0;                     /*< Current pstate (index in the speedPeakList)*/
-protected:
   std::vector<double> speed_per_pstate_; /*< List of supported CPU capacities (pstate related) */
 
 public:
-  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
-  set_speed_trace(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) */
+  /** @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);
 
+protected:
   tmgr_trace_event_t state_event_ = nullptr;
   Metric speed_                  = {1.0, 0, nullptr};
 };
@@ -151,8 +155,6 @@ public:
  * @brief A CpuAction represents the execution of code on one or several Cpus
  */
 class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action {
-  friend XBT_PUBLIC Cpu* getActionCpu(CpuAction * action);
-
 public:
   /** @brief Signal emitted when the action state changes (ready/running/done, etc)
    *  Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)`