X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c290f6e5704d8d1e227fc32720676a2613d5d51c..66e4277badef8f22852720b79a78e1f091c3b679:/src/s4u/s4u_Exec.cpp

diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp
index 60ba49aced..047c786681 100644
--- a/src/s4u/s4u_Exec.cpp
+++ b/src/s4u/s4u_Exec.cpp
@@ -15,9 +15,20 @@ namespace s4u {
 simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Exec::on_start;
 simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Exec::on_completion;
 
+Exec::Exec(sg_host_t host, double flops_amount) : Activity(), host_(host), flops_amount_(flops_amount)
+{
+  Activity::set_remaining(flops_amount_);
+  pimpl_ = simix::simcall([this] {
+    return kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl(name_, tracing_category_,
+                                                                        /*timeout_detector*/ nullptr, host_));
+  });
+}
+
 Exec* Exec::start()
 {
-  pimpl_ = simcall_execution_start(name_, tracing_category_, flops_amount_, 1. / priority_, bound_, host_);
+  simix::simcall([this] {
+    dynamic_cast<kernel::activity::ExecImpl*>(pimpl_.get())->start(flops_amount_, 1. / priority_, bound_);
+  });
   state_ = State::STARTED;
   on_start(Actor::self());
   return this;
@@ -99,6 +110,7 @@ ExecPtr Exec::set_host(Host* host)
   if (state_ == State::STARTED)
     boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->migrate(host);
   host_ = host;
+  boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->host_ = host;
   return this;
 }