allow to cancel a s4u::Exec

[simgrid.git] / src / s4u / s4u_Exec.cpp

diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp
index a61217d..94da9d2 100644 (file)
--- a/src/s4u/s4u_Exec.cpp
+++ b/src/s4u/s4u_Exec.cpp
@@ -15,11 +15,18 @@ namespace s4u {
 
 Activity* Exec::start()
 {
 
 Activity* Exec::start()
 {

-  pimpl_ = simcall_execution_start(name_, flops_amount_, 1. / priority_, bound_, host_);
+  pimpl_ = simcall_execution_start(name_, tracing_category_, flops_amount_, 1. / priority_, bound_, host_);

   state_ = State::STARTED;
   return this;
 }
 
   state_ = State::STARTED;
   return this;
 }
 

+Activity* Exec::cancel()
+{
+  simcall_execution_cancel(pimpl_);
+  state_ = State::CANCELED;
+  return this;
+}
+

 Activity* Exec::wait()
 {
   simcall_execution_wait(pimpl_);
 Activity* Exec::wait()
 {
   simcall_execution_wait(pimpl_);


@@ -98,13 +105,8 @@ ExecPtr Exec::set_name(std::string name)
 
 ExecPtr Exec::set_tracing_category(std::string category)
 {
 
 ExecPtr Exec::set_tracing_category(std::string category)
 {

-  xbt_assert(state_ == State::INITED, "Cannot change the name of an exec after its start");
-  if (category.empty())
-    return this;
-
-  simgrid::simix::simcall([this, category] {
-    boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->set_category(category);
-  });
+  xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start");
+  tracing_category_ = category;

   return this;
 }
 
   return this;
 }