ptask_BMF: refactor code and loop scenarios

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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index f52e203..cbe373f 100644 (file)
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -18,28 +18,22 @@ namespace activity {
 class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
   std::unique_ptr<resource::Action, std::function<void(resource::Action*)>> timeout_detector_{
       nullptr, [](resource::Action* a) { a->unref(); }};
-  actor::ActorImpl* actor_            = nullptr;
   double sharing_penalty_             = 1.0;
   double bound_                       = 0.0;
-  double start_time_                  = -1.0;
-  double finish_time_                 = -1.0;
   std::vector<s4u::Host*> hosts_;
   std::vector<double> flops_amounts_;
   std::vector<double> bytes_amounts_;
-  s4u::Exec* piface_;
   int cb_id_ = -1; // callback id from Host::on_state_change.connect()
 
 public:
   ExecImpl();
-  s4u::Exec* get_iface() { return piface_; }
 
   ExecImpl& set_timeout(double timeout) override;
   ExecImpl& set_bound(double bound);
   ExecImpl& set_sharing_penalty(double sharing_penalty);
-  void set_cb_id(unsigned int cb_id) { cb_id_ = cb_id; }
+  ExecImpl& update_sharing_penalty(double sharing_penalty);
 
-  double get_start_time() const { return start_time_; }
-  double get_finish_time() const { return finish_time_; }
+  void set_cb_id(unsigned int cb_id) { cb_id_ = cb_id; }
 
   ExecImpl& set_flops_amount(double flop_amount);
   ExecImpl& set_host(s4u::Host* host);
@@ -53,13 +47,15 @@ public:
   unsigned int get_host_number() const { return hosts_.size(); }
   double get_seq_remaining_ratio();
   double get_par_remaining_ratio();
+  double get_remaining() const override;
   virtual ActivityImpl* migrate(s4u::Host* to);
 
   ExecImpl* start();
   void post() override;
+  void set_exception(actor::ActorImpl* issuer) override;
   void finish() override;
 
-  static void wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl*>& execs, double timeout);
+  void reset();
 
   static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
 };