X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d21feacc9eab1017d4e5b9d989a5c68c89d1f47c..661e64114641721802e309fc277b081ea01078c8:/src/kernel/activity/ExecImpl.hpp

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 38cedadf04..9e35d73d76 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -14,34 +14,42 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-class XBT_PUBLIC ExecImpl : public ActivityImpl {
-  ~ExecImpl() override;
+class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
+  resource::Action* timeout_detector_ = nullptr;
+  double priority_                    = 1.0;
+  double bound_                       = 0.0;
+  std::vector<s4u::Host*> hosts_;
+  std::vector<double> flops_amounts_;
+  std::vector<double> bytes_amounts_;
+  ~ExecImpl();
 
 public:
-  explicit ExecImpl(std::string name, std::string tracing_category, s4u::Host* host);
-  explicit ExecImpl(std::string name, std::string tracing_category, s4u::Host* host, double timeout);
-  ExecImpl* start(double flops_amount, double priority, double bound);
-  void cancel();
-  void post() override;
-  void finish() override;
-  double get_remaining();
-  double get_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);
+  ExecImpl& set_timeout(double timeout);
+  ExecImpl& set_bound(double bound);
+  ExecImpl& set_priority(double priority);
 
-  /* 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& set_flops_amount(double flop_amount);
+  ExecImpl& set_host(s4u::Host* host);
+  s4u::Host* get_host() const { return hosts_.front(); }
 
-private:
-  resource::Action* timeout_detector_ = nullptr;
+  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);
 
-public:
-  static simgrid::xbt::signal<void(ExecImplPtr)> on_creation;
-  static simgrid::xbt::signal<void(ExecImplPtr)> on_completion;
-  static simgrid::xbt::signal<void(ExecImplPtr, simgrid::s4u::Host*)> on_migration;
+  unsigned int get_host_number() const { return hosts_.size(); }
+  double get_seq_remaining_ratio();
+  double get_par_remaining_ratio();
+  virtual ActivityImpl* migrate(s4u::Host* to);
+
+  ExecImpl* start();
+  void post() override;
+  void finish() override;
+
+  static xbt::signal<void(ExecImpl&)> on_creation;
+  static xbt::signal<void(ExecImpl const&)> on_completion;
+  static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
 };
-}
-}
-} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 #endif