simplification

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 5cb4464..8eb5a34 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -103,11 +103,11 @@ public:
   virtual simgrid::kernel::resource::Action* sleep(double duration) = 0;
 
   /** @brief Get the amount of cores */
-  virtual int get_cores_count();
+  virtual int get_core_count();
 
   /** @brief Get a forecast of the speed (in flops/s) if the load were as provided.
    *
-   * The provided load encompasses both the application's activities and the external load that come from a trace.
+   * The provided load should encompasses both the application's activities and the external load that come from a trace.
    *
    * Use a load of 1.0 to compute the amount of flops that the Cpu would deliver with one CPU-bound task.
    * If you use a load of 0, this function will return 0: when nobody is using the Cpu, it delivers nothing.
@@ -130,14 +130,14 @@ public:
   /** @brief Get the peak processor speed (in flops/s), at the specified pstate */
   virtual double get_pstate_peak_speed(int pstate_index);
 
-  virtual int get_pstates_count();
+  virtual int get_pstate_count();
   virtual void set_pstate(int pstate_index);
   virtual int get_pstate();
 
   simgrid::s4u::Host* get_host() { return host_; }
 
 private:
-  int cores_count_ = 1;
+  int core_count_ = 1;
   simgrid::s4u::Host* host_;
 
   int pstate_ = 0;                       /*< Current pstate (index in the speed_per_pstate_)*/
@@ -168,9 +168,9 @@ protected:
 class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action {
 public:
   /** @brief Signal emitted when the action state changes (ready/running/done, etc)
-   *  Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)`
+   *  Signature: `void(CpuAction *action)`
    */
-  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::kernel::resource::Action::State)> onStateChange;
+  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> on_state_change;
   /** @brief Signal emitted when the action share changes (amount of flops it gets)
    *  Signature: `void(CpuAction *action)`
    */