X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09be3731dc0739ab7e4cdb00716335b60acb4331..01b6b0c026e5fa6a87a45b53a4ce1e4dc580a358:/src/kernel/activity/ExecImpl.cpp

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index bffe2f5197..c1b58d5157 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -51,14 +51,6 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-ExecImpl::ExecImpl(const std::string& name, const std::string& tracing_category) : ActivityImpl(name)
-{
-  this->state_ = SIMIX_RUNNING;
-  this->set_category(tracing_category);
-
-  XBT_DEBUG("Create exec %p", this);
-}
-
 ExecImpl::~ExecImpl()
 {
   if (timeout_detector_)
@@ -66,60 +58,70 @@ ExecImpl::~ExecImpl()
   XBT_DEBUG("Destroy exec %p", this);
 }
 
-ExecImpl* ExecImpl::set_host(s4u::Host* host)
+ExecImpl& ExecImpl::set_host(s4u::Host* host)
 {
-  host_ = host;
-  return this;
+  if (not hosts_.empty())
+    hosts_.clear();
+  hosts_.push_back(host);
+  return *this;
+}
+
+ExecImpl& ExecImpl::set_hosts(const std::vector<s4u::Host*>& hosts)
+{
+  hosts_ = hosts;
+  return *this;
 }
 
-ExecImpl* ExecImpl::set_timeout(double timeout)
+ExecImpl& ExecImpl::set_timeout(double timeout)
 {
   if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
-    timeout_detector_ = host_->pimpl_cpu->sleep(timeout);
+    timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout);
     timeout_detector_->set_data(this);
   }
-  return this;
+  return *this;
 }
 
-ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
+ExecImpl& ExecImpl::set_flops_amount(double flops_amount)
 {
-  if (not MC_is_active() && not MC_record_replay_is_active()) {
-    surf_action_ = host_->pimpl_cpu->execution_start(flops_amount);
-    surf_action_->set_data(this);
-    surf_action_->set_priority(priority);
-    if (bound > 0)
-      surf_action_->set_bound(bound);
-  }
-
-  XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
-  ExecImpl::on_creation(this);
-  return this;
+  if (not flops_amounts_.empty())
+    flops_amounts_.clear();
+  flops_amounts_.push_back(flops_amount);
+  return *this;
 }
 
-ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
-                          const std::vector<double>& bytes_amounts)
+ExecImpl& ExecImpl::set_flops_amounts(const std::vector<double>& flops_amounts)
 {
-  /* set surf's synchro */
-  if (not MC_is_active() && not MC_record_replay_is_active()) {
-    surf_action_ = surf_host_model->execute_parallel(hosts, flops_amounts.data(), bytes_amounts.data(), -1);
-    if (surf_action_ != nullptr) {
-      surf_action_->set_data(this);
-    }
-  }
-  XBT_DEBUG("Create parallel execute synchro %p", this);
-  ExecImpl::on_creation(this);
-  return this;
+  flops_amounts_ = flops_amounts;
+  return *this;
 }
-void ExecImpl::cancel()
+
+ExecImpl& ExecImpl::set_bytes_amounts(const std::vector<double>& bytes_amounts)
 {
-  XBT_VERB("This exec %p is canceled", this);
-  if (surf_action_ != nullptr)
-    surf_action_->cancel();
+  bytes_amounts_ = bytes_amounts;
+
+  return *this;
 }
 
-double ExecImpl::get_remaining()
+ExecImpl* ExecImpl::start()
 {
-  return surf_action_ ? surf_action_->get_remains() : 0;
+  state_ = SIMIX_RUNNING;
+  if (not MC_is_active() && not MC_record_replay_is_active()) {
+    if (hosts_.size() == 1) {
+      surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front());
+      surf_action_->set_priority(priority_);
+      surf_action_->set_category(get_tracing_category());
+
+      if (bound_ > 0)
+        surf_action_->set_bound(bound_);
+    } else {
+      surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
+    }
+    surf_action_->set_data(this);
+  }
+
+  XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
+  ExecImpl::on_creation(*this);
+  return this;
 }
 
 double ExecImpl::get_seq_remaining_ratio()
@@ -133,20 +135,21 @@ double ExecImpl::get_par_remaining_ratio()
   return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
 }
 
-void ExecImpl::set_bound(double bound)
+ExecImpl& ExecImpl::set_bound(double bound)
 {
-  if (surf_action_)
-    surf_action_->set_bound(bound);
+  bound_ = bound;
+  return *this;
 }
-void ExecImpl::set_priority(double priority)
+
+ExecImpl& ExecImpl::set_priority(double priority)
 {
-  if (surf_action_)
-    surf_action_->set_priority(priority);
+  priority_ = priority;
+  return *this;
 }
 
 void ExecImpl::post()
 {
-  if (host_ && not host_->is_on()) { /* FIXME: handle resource failure for parallel tasks too */
+  if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */
     /* If the host running the synchro failed, notice it. This way, the asking
      * process can be killed if it runs on that host itself */
     state_ = SIMIX_FAILED;
@@ -159,7 +162,7 @@ void ExecImpl::post()
     state_ = SIMIX_DONE;
   }
 
-  on_completion(this);
+  on_completion(*this);
 
   if (surf_action_) {
     surf_action_->unref();
@@ -240,16 +243,16 @@ ActivityImpl* ExecImpl::migrate(s4u::Host* to)
     this->surf_action_ = new_action;
   }
 
-  on_migration(this, to);
+  on_migration(*this, to);
   return this;
 }
 
 /*************
  * Callbacks *
  *************/
-xbt::signal<void(ExecImplPtr)> ExecImpl::on_creation;
-xbt::signal<void(ExecImplPtr)> ExecImpl::on_completion;
-xbt::signal<void(ExecImplPtr, s4u::Host*)> ExecImpl::on_migration;
+xbt::signal<void(ExecImpl&)> ExecImpl::on_creation;
+xbt::signal<void(ExecImpl const&)> ExecImpl::on_completion;
+xbt::signal<void(ExecImpl const&, s4u::Host*)> ExecImpl::on_migration;
 
 } // namespace activity
 } // namespace kernel