rename simgrid::kernel::model into simgrid::kernel::resource

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 4c9fa00..b0ff040 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -8,6 +8,7 @@
 
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "src/kernel/model/Resource.hpp"
 
 #include <list>
 
@@ -45,7 +46,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::resource::Resource
+{
 public:
   /**
    * @brief Cpu constructor
@@ -56,8 +58,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 +69,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();
 
@@ -133,7 +135,7 @@ public:
   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) */
 
   tmgr_trace_event_t stateEvent_ = nullptr;
-  s_surf_metric_t speed_ = {1.0, 0, nullptr};
+  Metric speed_                  = {1.0, 0, nullptr};
 };
 
 /**********
@@ -157,7 +159,7 @@ public:
   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)
+  CpuAction(simgrid::surf::Model * model, double cost, bool failed, kernel::lmm::Variable* var)
       : Action(model, cost, failed, var)
   {
   }