Reworking user_bound for Exec actions.

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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 967b186..61b588b 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -44,8 +44,8 @@ public:
   CpuCas01(const CpuCas01&) = delete;
   CpuCas01& operator=(const CpuCas01&) = delete;
   void apply_event(profile::Event* event, double value) override;
-  CpuAction* execution_start(double size) override;
-  CpuAction* execution_start(double size, int requested_cores) override;
+  CpuAction* execution_start(double size, double user_bound) override;
+  CpuAction* execution_start(double size, int requested_cores, double user_bound) override;
   CpuAction* sleep(double duration) override;
 
   bool is_used() const override;
@@ -58,12 +58,8 @@ protected:
  * Action *
  **********/
 class CpuCas01Action : public CpuAction {
-  friend CpuAction* CpuCas01::execution_start(double size);
-  friend CpuAction* CpuCas01::sleep(double duration);
-
 public:
-  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint,
-                 int requested_core = 1);
+  CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int requested_core);
   CpuCas01Action(const CpuCas01Action&) = delete;
   CpuCas01Action& operator=(const CpuCas01Action&) = delete;
   int requested_core() const;