change simgrid::surf::Resource into simgrid::kernel::model::Resource

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index f360cf1..9a8bdde 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -7,7 +7,7 @@
 #define SURF_CPU_INTERFACE_HPP_
 
 #include "simgrid/s4u/Host.hpp"
-#include "src/surf/maxmin_private.hpp"
+#include "src/kernel/lmm/maxmin.hpp"
 
 #include <list>
 
@@ -45,7 +45,8 @@ public:
 * @brief SURF cpu resource interface class
 * @details A Cpu represent a cpu associated to a host
 */
-XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
+XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::model::Resource
+{
 public:
   /**
    * @brief Cpu constructor
@@ -56,8 +57,8 @@ public:
    * @param speedPerPstate Processor speed (in flop per second) for each pstate
    * @param core The number of core of this Cpu
    */
-  Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
-      std::vector<double> *speedPerPstate, int core);
+  Cpu(simgrid::surf::Model * model, simgrid::s4u::Host * host, kernel::lmm::Constraint * constraint,
+      std::vector<double> * speedPerPstate, int core);
 
   /**
    * @brief Cpu constructor
@@ -67,7 +68,7 @@ public:
    * @param speedPerPstate Processor speed (in flop per second) for each pstate
    * @param core The number of core of this Cpu
    */
-  Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+  Cpu(simgrid::surf::Model* model, simgrid::s4u::Host* host, std::vector<double>* speedPerPstate, int core);
 
   ~Cpu();
 
@@ -144,21 +145,23 @@ public:
  * @brief A CpuAction represents the execution of code on one or several Cpus
  */
 XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
-friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *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::surf::Action::State previous)`
- */
-static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::surf::Action::State)> onStateChange;
-/** @brief Signal emitted when the action share changes (amount of flops it gets)
- *  Signature: `void(CpuAction *action)`
- */
-static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> onShareChange;
+  /** @brief Signal emitted when the action state changes (ready/running/done, etc)
+   *  Signature: `void(CpuAction *action, simgrid::surf::Action::State previous)`
+   */
+  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::surf::Action::State)> onStateChange;
+  /** @brief Signal emitted when the action share changes (amount of flops it gets)
+   *  Signature: `void(CpuAction *action)`
+   */
+  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> onShareChange;
 
-  CpuAction(simgrid::surf::Model *model, double cost, bool failed)
-  : Action(model, cost, failed) {}
-  CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
-  : Action(model, cost, failed, var) {}
+  CpuAction(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed) {}
+  CpuAction(simgrid::surf::Model * model, double cost, bool failed, kernel::lmm::Variable* var)
+      : Action(model, cost, failed, var)
+  {
+  }
 
   void setState(simgrid::surf::Action::State state) override;