Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
try to match Activity design to Resource design
authorSUTER Frederic <frederic.suter@cc.in2p3.fr>
Sat, 27 Mar 2021 11:28:25 +0000 (12:28 +0100)
committerSUTER Frederic <frederic.suter@cc.in2p3.fr>
Tue, 30 Mar 2021 06:00:07 +0000 (08:00 +0200)
include/simgrid/s4u/Exec.hpp
include/simgrid/s4u/Io.hpp
src/kernel/activity/ExecImpl.hpp
src/s4u/s4u_Exec.cpp
src/s4u/s4u_Io.cpp

index 0ae3e32..ae3e534 100644 (file)
@@ -31,12 +31,6 @@ namespace s4u {
  */
 class XBT_PUBLIC Exec : public Activity_T<Exec> {
   friend kernel::activity::ExecImpl;
-  double priority_              = 1.0;
-  double bound_                 = 0.0;
-  double timeout_               = -1.0; // Infinite timeout by default
-  std::vector<double> flops_amounts_;
-  std::vector<double> bytes_amounts_;
-  std::vector<Host*> hosts_;
   bool parallel_ = false;
   double start_time_ = -1.0;
   double finish_time_ = -1.0;
@@ -54,6 +48,15 @@ public:
 
   static ExecPtr init();
   Exec* start() override;
+  Exec* wait() override;
+  Exec* wait_for(double timeout) override;
+  /*! take a vector of s4u::ExecPtr and return when one of them is finished.
+   * The return value is the rank of the first finished ExecPtr. */
+  static int wait_any(std::vector<ExecPtr>* execs) { return wait_any_for(execs, -1); }
+  /*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/
+  static int wait_any_for(std::vector<ExecPtr>* execs, double timeout);
+  Exec* cancel() override;
+
   /** @brief On sequential executions, returns the amount of flops that remain to be done; This cannot be used on
    * parallel executions. */
   double get_remaining() const override;
@@ -65,19 +68,10 @@ public:
   ExecPtr set_flops_amounts(const std::vector<double>& flops_amounts);
   ExecPtr set_bytes_amounts(const std::vector<double>& bytes_amounts);
 
-  Exec* wait() override;
-  Exec* wait_for(double timeout) override;
-  /*! take a vector of s4u::ExecPtr and return when one of them is finished.
-   * The return value is the rank of the first finished ExecPtr. */
-  static int wait_any(std::vector<ExecPtr>* execs) { return wait_any_for(execs, -1); }
-  /*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/
-  static int wait_any_for(std::vector<ExecPtr>* execs, double timeout);
-
   ExecPtr set_bound(double bound);
   ExecPtr set_priority(double priority);
   XBT_ATTRIB_DEPRECATED_v329("Please use exec_init(...)->wait_for(timeout)") ExecPtr set_timeout(double timeout);
 
-  Exec* cancel() override;
   Host* get_host() const;
   unsigned int get_host_number() const;
   double get_start_time() const { return start_time_; }
@@ -85,7 +79,7 @@ public:
   void set_finish_time(double finish_time) { finish_time_ = finish_time; }
   double get_cost() const;
   bool is_parallel() const { return parallel_; }
-  bool is_assigned() const override { return not hosts_.empty(); }
+  bool is_assigned() const override;
 };
 
 } // namespace s4u
index a4423ba..2f3f656 100644 (file)
@@ -20,20 +20,13 @@ namespace s4u {
  */
 
 class XBT_PUBLIC Io : public Activity_T<Io> {
-public:
-  enum class OpType { READ, WRITE };
-
-private:
-  Disk* disk_       = nullptr;
-  sg_size_t size_   = 0;
-  OpType type_      = OpType::READ;
-
-  Io();
-
-public:
 #ifndef DOXYGEN
   friend Disk;    // Factory of IOs
 #endif
+  Io();
+
+public:
+  enum class OpType { READ, WRITE };
 
   static xbt::signal<void(Io const&)> on_start;
   static xbt::signal<void(Io const&)> on_completion;
@@ -50,7 +43,7 @@ public:
   IoPtr set_size(sg_size_t size);
   IoPtr set_op_type(OpType type);
 
-  bool is_assigned() const override { return disk_ != nullptr; }
+  bool is_assigned() const override;
 };
 
 } // namespace s4u
index 929f5b2..f32376b 100644 (file)
@@ -37,6 +37,7 @@ public:
   ExecImpl& set_flops_amount(double flop_amount);
   ExecImpl& set_host(s4u::Host* host);
   s4u::Host* get_host() const { return hosts_.front(); }
+  std::vector<s4u::Host*> get_hosts() const { return hosts_; }
 
   ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
   ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
index 51c7408..0affcec 100644 (file)
@@ -30,6 +30,24 @@ ExecPtr Exec::init()
   return ExecPtr(pimpl->get_iface());
 }
 
+Exec* Exec::start()
+{
+  kernel::actor::simcall([this] {
+    (*boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_))
+        .set_name(get_name())
+        .set_tracing_category(get_tracing_category())
+        .start();
+  });
+
+  if (suspended_)
+    pimpl_->suspend();
+
+  state_      = State::STARTED;
+  start_time_ = pimpl_->surf_action_->get_start_time();
+  on_start(*this);
+  return this;
+}
+
 Exec* Exec::wait()
 {
   return this->wait_for(-1);
@@ -83,15 +101,34 @@ Exec* Exec::cancel()
 ExecPtr Exec::set_bound(double bound)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING,
-      "Cannot change the bound of an exec after its start");
-  bound_ = bound;
+             "Cannot change the bound of an exec after its start");
+  kernel::actor::simcall(
+      [this, bound] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_bound(bound); });
   return this;
 }
+
+/** @brief  Change the execution priority, don't you think?
+ *
+ * An execution with twice the priority will get twice the amount of flops when the resource is shared.
+ * The default priority is 1.
+ *
+ * Currently, this cannot be changed once the exec started. */
+ExecPtr Exec::set_priority(double priority)
+{
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+             "Cannot change the priority of an exec after its start");
+  kernel::actor::simcall([this, priority] {
+    boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_sharing_penalty(1. / priority);
+  });
+  return this;
+}
+
 ExecPtr Exec::set_timeout(double timeout) // XBT_ATTRIB_DEPRECATED_v329
 {
-  xbt_assert(state_ == State::INITED|| state_ == State::STARTING,
-      "Cannot change the bound of an exec after its start");
-  timeout_ = timeout;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+             "Cannot change the bound of an exec after its start");
+  kernel::actor::simcall(
+      [this, timeout] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_timeout(timeout); });
   return this;
 }
 
@@ -99,8 +136,10 @@ ExecPtr Exec::set_flops_amount(double flops_amount)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING,
       "Cannot change the flop_amount of an exec after its start");
-  flops_amounts_.assign(1, flops_amount);
-  Activity::set_remaining(flops_amounts_.front());
+  kernel::actor::simcall([this, flops_amount] {
+    boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_flops_amount(flops_amount);
+  });
+  Activity::set_remaining(flops_amount);
   return this;
 }
 
@@ -108,7 +147,9 @@ ExecPtr Exec::set_flops_amounts(const std::vector<double>& flops_amounts)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING,
       "Cannot change the flops_amounts of an exec after its start");
-  flops_amounts_ = flops_amounts;
+  kernel::actor::simcall([this, flops_amounts] {
+    boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_flops_amounts(flops_amounts);
+  });
   parallel_      = true;
   return this;
 }
@@ -117,7 +158,9 @@ ExecPtr Exec::set_bytes_amounts(const std::vector<double>& bytes_amounts)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING,
       "Cannot change the bytes_amounts of an exec after its start");
-  bytes_amounts_ = bytes_amounts;
+  kernel::actor::simcall([this, bytes_amounts] {
+    boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_bytes_amounts(bytes_amounts);
+  });
   parallel_      = true;
   return this;
 }
@@ -133,23 +176,6 @@ unsigned int Exec::get_host_number() const
 {
   return static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->get_host_number();
 }
-double Exec::get_cost() const
-{
-  return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost();
-}
-
-/** @brief  Change the execution priority, don't you think?
- *
- * An execution with twice the priority will get twice the amount of flops when the resource is shared.
- * The default priority is 1.
- *
- * Currently, this cannot be changed once the exec started. */
-ExecPtr Exec::set_priority(double priority)
-{
-  xbt_assert(state_ == State::INITED, "Cannot change the priority of an exec after its start");
-  priority_ = priority;
-  return this;
-}
 
 /** @brief Change the host on which this activity takes place.
  *
@@ -158,12 +184,12 @@ ExecPtr Exec::set_host(Host* host)
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTING || state_ == State::STARTED,
              "Cannot change the host of an exec once it's done (state: %d)", (int)state_);
-  hosts_.assign(1, host);
 
   if (state_ == State::STARTED)
     boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->migrate(host);
 
-  boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_host(host);
+  kernel::actor::simcall(
+      [this, host] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_host(host); });
 
   if (state_ == State::STARTING)
   // Setting the host may allow to start the activity, let's try
@@ -177,7 +203,8 @@ ExecPtr Exec::set_hosts(const std::vector<Host*>& hosts)
   xbt_assert(state_ == State::INITED || state_ == State::STARTING,
       "Cannot change the hosts of an exec once it's done (state: %d)", (int)state_);
 
-  hosts_    = hosts;
+  kernel::actor::simcall(
+      [this, hosts] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_hosts(hosts); });
   parallel_ = true;
 
   // Setting the host may allow to start the activity, let's try
@@ -187,35 +214,9 @@ ExecPtr Exec::set_hosts(const std::vector<Host*>& hosts)
   return this;
 }
 
-Exec* Exec::start()
+double Exec::get_cost() const
 {
-  if (is_parallel())
-    kernel::actor::simcall([this] {
-      (*boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_))
-          .set_hosts(hosts_)
-          .set_timeout(timeout_)
-          .set_flops_amounts(flops_amounts_)
-          .set_bytes_amounts(bytes_amounts_)
-          .start();
-    });
-  else
-    kernel::actor::simcall([this] {
-      (*boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_))
-          .set_name(get_name())
-          .set_tracing_category(get_tracing_category())
-          .set_sharing_penalty(1. / priority_)
-          .set_bound(bound_)
-          .set_flops_amount(flops_amounts_.front())
-          .start();
-    });
-
-  if (suspended_)
-    pimpl_->suspend();
-
-  state_ = State::STARTED;
-  start_time_ = pimpl_->surf_action_->get_start_time();
-  on_start(*this);
-  return this;
+  return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost();
 }
 
 double Exec::get_remaining() const
@@ -242,6 +243,10 @@ double Exec::get_remaining_ratio() const
         [this]() { return boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_seq_remaining_ratio(); });
 }
 
+bool Exec::is_assigned() const
+{
+  return not boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_hosts().empty();
+}
 } // namespace s4u
 } // namespace simgrid
 
index aec4f16..082d00b 100644 (file)
@@ -27,14 +27,8 @@ IoPtr Io::init()
 
 Io* Io::start()
 {
-  kernel::actor::simcall([this] {
-    (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-                  .set_name(get_name())
-                  .set_disk(disk_->get_impl())
-                  .set_size(size_)
-                  .set_type(type_)
-                  .start();
-  });
+  kernel::actor::simcall(
+      [this] { (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)).set_name(get_name()).start(); });
 
   if (suspended_)
     pimpl_->suspend();
@@ -46,7 +40,7 @@ Io* Io::start()
 
 Io* Io::cancel()
 {
-  simgrid::kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
+  kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
   state_ = State::CANCELED;
   on_completion(*this);
   return this;
@@ -73,7 +67,10 @@ Io* Io::wait_for(double timeout)
 
 IoPtr Io::set_disk(sg_disk_t disk)
 {
-  disk_ = disk;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set disk once the Io is started");
+
+  kernel::actor::simcall(
+      [this, disk] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_disk(disk->get_impl()); });
 
   // Setting the disk may allow to start the activity, let's try
   if (state_ == State::STARTING)
@@ -84,14 +81,18 @@ IoPtr Io::set_disk(sg_disk_t disk)
 
 IoPtr Io::set_size(sg_size_t size)
 {
-  size_ = size;
-  Activity::set_remaining(size_);
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, size] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_size(size); });
+  Activity::set_remaining(size);
   return this;
 }
 
 IoPtr Io::set_op_type(OpType type)
 {
-  type_ = type;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, type] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_type(type); });
   return this;
 }
 
@@ -107,5 +108,10 @@ sg_size_t Io::get_performed_ioops() const
   return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops();
 }
 
+bool Io::is_assigned() const
+{
+  return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
+}
+
 } // namespace s4u
 } // namespace simgrid