Merge branch 'master' into disk

[simgrid.git] / src / kernel / activity / ExecImpl.hpp

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 86f2d0a..524e3d1 100644 (file)
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -14,32 +14,36 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-class XBT_PUBLIC ExecImpl : public ActivityImpl {
+class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
   resource::Action* timeout_detector_ = nullptr;
+  double sharing_penalty_             = 1.0;
+  double bound_                       = 0.0;
+  std::vector<s4u::Host*> hosts_;
+  std::vector<double> flops_amounts_;
+  std::vector<double> bytes_amounts_;
   ~ExecImpl();
 
 public:
-  ExecImpl* start(double flops_amount, double priority, double bound);
-  ExecImpl* start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
-                  const std::vector<double>& bytes_amounts);
+  ExecImpl& set_timeout(double timeout);
+  ExecImpl& set_bound(double bound);
+  ExecImpl& set_sharing_penalty(double sharing_penalty);
 
-  ExecImpl& set_name(const std::string& name);
-  ExecImpl& set_tracing_category(const std::string& category);
+  ExecImpl& set_flops_amount(double flop_amount);
   ExecImpl& set_host(s4u::Host* host);
-  ExecImpl& set_timeout(double timeout);
+  s4u::Host* get_host() const { return hosts_.front(); }
 
-  void cancel();
-  void post() override;
-  void finish() override;
-  double get_remaining() const;
+  ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
+  ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
+  ExecImpl& set_hosts(const std::vector<s4u::Host*>& hosts);
+
+  unsigned int get_host_number() const { return hosts_.size(); }
   double get_seq_remaining_ratio();
   double get_par_remaining_ratio();
-  void set_bound(double bound);       // deprecated. To be removed in v3.25
-  void set_priority(double priority); // deprecated. To be removed in v3.25
   virtual ActivityImpl* migrate(s4u::Host* to);
 
-  /* The host where the execution takes place. nullptr means this is a parallel exec (and only surf knows the hosts) */
-  s4u::Host* host_ = nullptr;
+  ExecImpl* start();
+  void post() override;
+  void finish() override;
 
   static xbt::signal<void(ExecImpl&)> on_creation;
   static xbt::signal<void(ExecImpl const&)> on_completion;