X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/450b524c743d19378a2efa1d3c19672e19fa4b2c..7d1122d12caaa3cc08cea6b302f86edaaa8a8bd7:/src/s4u/s4u_Activity.cpp

diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index 529d08f471..7b32938217 100644
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -8,6 +8,7 @@
 #include "simgrid/s4u/Activity.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "src/kernel/activity/ActivityImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities");
@@ -22,6 +23,17 @@ void Activity::wait_until(double time_limit)
     wait_for(time_limit - now);
 }
 
+Activity* Activity::wait_for(double timeout)
+{
+  if (state_ == State::INITED)
+    vetoable_start();
+
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  kernel::actor::simcall_blocking([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); });
+  complete(State::FINISHED);
+  return this;
+}
+
 bool Activity::test()
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
@@ -34,14 +46,20 @@ bool Activity::test()
     this->vetoable_start();
 
   if (kernel::actor::simcall([this] { return this->get_impl()->test(); })) {
-    state_ = State::FINISHED;
-    this->release_dependencies();
+    complete(State::FINISHED);
     return true;
   }
 
   return false;
 }
 
+Activity* Activity::cancel()
+{
+  kernel::actor::simcall([this] { pimpl_->cancel(); });
+  complete(State::CANCELED);
+  return this;
+}
+
 Activity* Activity::suspend()
 {
   if (suspended_)
@@ -65,25 +83,9 @@ Activity* Activity::resume()
   return this;
 }
 
-const char* Activity::get_state_str()
+const char* Activity::get_state_str() const
 {
-  switch (state_) {
-    case State::INITED:
-      return "INITED";
-
-    case State::STARTING:
-      return "STARTING";
-
-    case State::STARTED:
-      return "STARTED";
-
-    case State::CANCELED:
-      return "CANCELED";
-
-    case State::FINISHED:
-      return "FINISHED";
-  }
-  THROW_IMPOSSIBLE;
+  return to_c_str(state_);
 }
 
 double Activity::get_remaining() const