X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54f9d48567e65bd17b9ad3544b5aad57bef54463..a5c102f3397e8112b97c27981bfdbcaac76d79f6:/src/kernel/activity/ExecImpl.cpp

diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index b33bd1cf3e..844847a705 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -7,7 +7,6 @@
 #include "simgrid/Exception.hpp"
 #include "simgrid/modelchecker.h"
 #include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_host_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
@@ -52,18 +51,8 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-ExecImpl::ExecImpl(std::string name, std::string tracing_category) : ActivityImpl(std::move(name))
-{
-  this->state_ = SIMIX_RUNNING;
-  this->set_category(std::move(tracing_category));
-
-  XBT_DEBUG("Create exec %p", this);
-}
-
 ExecImpl::~ExecImpl()
 {
-  if (surf_action_)
-    surf_action_->unref();
   if (timeout_detector_)
     timeout_detector_->unref();
   XBT_DEBUG("Destroy exec %p", this);
@@ -75,6 +64,18 @@ ExecImpl* ExecImpl::set_host(s4u::Host* host)
   return this;
 }
 
+ExecImpl* ExecImpl::set_name(const std::string& name)
+{
+  ActivityImpl::set_name(name);
+  return this;
+}
+
+ExecImpl* ExecImpl::set_tracing_category(const std::string& category)
+{
+  ActivityImpl::set_category(category);
+  return this;
+}
+
 ExecImpl* ExecImpl::set_timeout(double timeout)
 {
   if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
@@ -86,6 +87,7 @@ ExecImpl* ExecImpl::set_timeout(double timeout)
 
 ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
 {
+  state_ = SIMIX_RUNNING;
   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);
@@ -95,13 +97,14 @@ ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
   }
 
   XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
-  ExecImpl::on_creation(this);
+  ExecImpl::on_creation(*this);
   return this;
 }
 
 ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
                           const std::vector<double>& bytes_amounts)
 {
+  state_ = SIMIX_RUNNING;
   /* 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);
@@ -110,7 +113,7 @@ ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vecto
     }
   }
   XBT_DEBUG("Create parallel execute synchro %p", this);
-  ExecImpl::on_creation(this);
+  ExecImpl::on_creation(*this);
   return this;
 }
 void ExecImpl::cancel()
@@ -120,7 +123,7 @@ void ExecImpl::cancel()
     surf_action_->cancel();
 }
 
-double ExecImpl::get_remaining()
+double ExecImpl::get_remaining() const
 {
   return surf_action_ ? surf_action_->get_remains() : 0;
 }
@@ -162,7 +165,7 @@ void ExecImpl::post()
     state_ = SIMIX_DONE;
   }
 
-  on_completion(this);
+  on_completion(*this);
 
   if (surf_action_) {
     surf_action_->unref();
@@ -225,7 +228,7 @@ void ExecImpl::finish()
   }
 }
 
-ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to)
+ActivityImpl* ExecImpl::migrate(s4u::Host* to)
 {
   if (not MC_is_active() && not MC_record_replay_is_active()) {
     resource::Action* old_action = this->surf_action_;
@@ -243,16 +246,16 @@ ActivityImpl* ExecImpl::migrate(simgrid::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