transfer some parts of the initialization from SIMIX_global_init to EngineImpl::initi...

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

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 4e6bf2b..0b65d2b 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -57,7 +57,7 @@ public:
        * method in surf_presolve */
   };
 
-  kernel::resource::Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
+  kernel::resource::CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
   HostL07Model* hostModel_;
 };
 
@@ -84,16 +84,16 @@ public:
  * Resource *
  ************/
 
-class CpuL07 : public kernel::resource::Cpu {
+class CpuL07 : public kernel::resource::CpuImpl {
 public:
-  using kernel::resource::Cpu::Cpu;
+  using kernel::resource::CpuImpl::CpuImpl;
   CpuL07(const CpuL07&) = delete;
   CpuL07& operator=(const CpuL07&) = delete;
 
   bool is_used() const override;
   void apply_event(kernel::profile::Event* event, double value) override;
-  kernel::resource::CpuAction* execution_start(double size) override;
-  kernel::resource::CpuAction* execution_start(double, int) override
+  kernel::resource::CpuAction* execution_start(double size, double user_bound) override;
+  kernel::resource::CpuAction* execution_start(double, int, double) override
   {
     THROW_UNIMPLEMENTED;
     return nullptr;
@@ -113,7 +113,7 @@ public:
   bool is_used() const override;
   void apply_event(kernel::profile::Event* event, double value) override;
   void set_bandwidth(double value) override;
-  LinkImpl* set_latency(double value) override;
+  void set_latency(double value) override;
 };
 
 /**********
@@ -130,7 +130,7 @@ class L07Action : public kernel::resource::CpuAction {
   double latency_;
   double rate_;
 
-  friend CpuAction* CpuL07::execution_start(double size);
+  friend CpuAction* CpuL07::execution_start(double size, double user_bound);
   friend CpuAction* CpuL07::sleep(double duration);
   friend CpuAction* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                                                    const double* bytes_amount, double rate);