X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/543a9d7e86cfdffac751091543019b9bdaffff6b..09392faf42646e631a4e42553e901410eb3e488e:/src/s4u/s4u_Activity.cpp

diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index eee17e8d1a..a1711b5fb5 100644
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,11 +9,12 @@
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/Exec.hpp>
 #include <simgrid/s4u/Io.hpp>
+#include <simgrid/s4u/Mess.hpp>
 #include <xbt/log.h>
 
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
-#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/kernel/actor/CommObserver.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities");
@@ -24,9 +25,6 @@ template class xbt::Extendable<s4u::Activity>;
 
 namespace s4u {
 
-xbt::signal<void(Activity&)> Activity::on_veto;
-xbt::signal<void(Activity&)> Activity::on_completion;
-
 std::set<Activity*>* Activity::vetoed_activities_ = nullptr;
 
 void Activity::destroy()
@@ -50,19 +48,22 @@ void Activity::wait_until(double time_limit)
 Activity* Activity::wait_for(double timeout)
 {
   if (state_ == State::INITED)
-    vetoable_start();
+    start();
 
   if (state_ == State::FAILED) {
     if (dynamic_cast<Comm*>(this))
       throw NetworkFailureException(XBT_THROW_POINT, "Cannot wait for a failed comm");
+    if (dynamic_cast<Mess*>(this))
+      throw NetworkFailureException(XBT_THROW_POINT, "Cannot wait for a failed mess");
     if (dynamic_cast<Exec*>(this))
       throw HostFailureException(XBT_THROW_POINT, "Cannot wait for a failed exec");
     if (dynamic_cast<Io*>(this))
       throw StorageFailureException(XBT_THROW_POINT, "Cannot wait for a failed I/O");
+    THROW_IMPOSSIBLE;
   }
 
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-  kernel::actor::ActivityWaitSimcall observer{issuer, pimpl_.get(), timeout};
+  kernel::actor::ActivityWaitSimcall observer{issuer, pimpl_.get(), timeout, "wait_for"};
   if (kernel::actor::simcall_blocking(
           [&observer] { observer.get_activity()->wait_for(observer.get_issuer(), observer.get_timeout()); }, &observer))
     throw TimeoutException(XBT_THROW_POINT, "Timeouted");
@@ -79,11 +80,11 @@ bool Activity::test()
     return true;
 
   if (state_ == State::INITED || state_ == State::STARTING)
-    this->vetoable_start();
+    this->start();
 
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-  kernel::actor::ActivityTestSimcall observer{issuer, pimpl_.get()};
-  if (kernel::actor::simcall_blocking([&observer] { observer.get_activity()->test(observer.get_issuer()); },
+  kernel::actor::ActivityTestSimcall observer{issuer, pimpl_.get(), "test"};
+  if (kernel::actor::simcall_answered([&observer] { return observer.get_activity()->test(observer.get_issuer()); },
                                       &observer)) {
     complete(State::FINISHED);
     return true;
@@ -91,30 +92,32 @@ bool Activity::test()
   return false;
 }
 
-ssize_t Activity::test_any(const std::vector<ActivityPtr>& activities)
+ssize_t Activity::test_any(const std::vector<ActivityPtr>& activities) // XBT_ATTRIB_DEPRECATED_v339
 {
   std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
   std::transform(begin(activities), end(activities), begin(ractivities),
                  [](const ActivityPtr& act) { return act->pimpl_.get(); });
 
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-  kernel::actor::ActivityTestanySimcall observer{issuer, ractivities};
-  ssize_t changed_pos = kernel::actor::simcall_blocking(
-      [&observer] { kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); },
+  kernel::actor::ActivityTestanySimcall observer{issuer, ractivities, "test_any"};
+  ssize_t changed_pos = kernel::actor::simcall_answered(
+      [&observer] {
+        return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities());
+      },
       &observer);
   if (changed_pos != -1)
     activities.at(changed_pos)->complete(State::FINISHED);
   return changed_pos;
 }
 
-ssize_t Activity::wait_any_for(const std::vector<ActivityPtr>& activities, double timeout)
+ssize_t Activity::deprecated_wait_any_for(const std::vector<ActivityPtr>& activities, double timeout) // XBT_ATTRIB_DEPRECATED_v339
 {
   std::vector<kernel::activity::ActivityImpl*> ractivities(activities.size());
   std::transform(begin(activities), end(activities), begin(ractivities),
                  [](const ActivityPtr& activity) { return activity->pimpl_.get(); });
 
   kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-  kernel::actor::ActivityWaitanySimcall observer{issuer, ractivities, timeout};
+  kernel::actor::ActivityWaitanySimcall observer{issuer, ractivities, timeout, "wait_any_for"};
   ssize_t changed_pos = kernel::actor::simcall_blocking(
       [&observer] {
         kernel::activity::ActivityImpl::wait_any_for(observer.get_issuer(), observer.get_activities(),
@@ -128,7 +131,7 @@ ssize_t Activity::wait_any_for(const std::vector<ActivityPtr>& activities, doubl
 
 Activity* Activity::cancel()
 {
-  kernel::actor::simcall([this] {
+  kernel::actor::simcall_answered([this] {
     XBT_HERE();
     if (pimpl_)
       pimpl_->cancel();