X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea10e88fd41a11386d9e3868d72ab8cb933a4292..17ac6c61bd407825851b824adbfa28d64fb69587:/src/kernel/activity/ActivityImpl.cpp?ds=sidebyside

diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp
index 3c47e41553..1f373dd5ee 100644
--- a/src/kernel/activity/ActivityImpl.cpp
+++ b/src/kernel/activity/ActivityImpl.cpp
@@ -20,9 +20,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_activity, kernel, "Kernel activity-related synchronization");
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 ActivityImpl::~ActivityImpl()
 {
@@ -113,13 +111,13 @@ void ActivityImpl::wait_for(actor::ActorImpl* issuer, double timeout)
     /* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
     /* Comms handle that a bit differently of the other activities */
     if (auto* comm = dynamic_cast<CommImpl*>(this)) {
-      resource::Action* sleep = issuer->get_host()->get_cpu()->sleep(timeout);
-      sleep->set_activity(comm);
+      resource::Action* sleep_action = issuer->get_host()->get_cpu()->sleep(timeout);
+      sleep_action->set_activity(comm);
 
       if (issuer == comm->src_actor_)
-        comm->src_timeout_ = sleep;
+        comm->src_timeout_ = sleep_action;
       else
-        comm->dst_timeout_ = sleep;
+        comm->dst_timeout_ = sleep_action;
     } else {
       SynchroImplPtr synchro(new SynchroImpl([this, issuer]() {
         this->unregister_simcall(&issuer->simcall_);
@@ -142,12 +140,13 @@ void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<Acti
     auto* observer = dynamic_cast<kernel::actor::ActivityWaitanySimcall*>(issuer->simcall_.observer_);
     xbt_assert(observer != nullptr);
     xbt_assert(timeout <= 0.0, "Timeout not implemented for waitany in the model-checker");
-    int idx   = observer->get_value();
-    auto* act = activities[idx];
-    act->simcalls_.push_back(&issuer->simcall_);
-    observer->set_result(idx);
-    act->set_state(State::DONE);
-    act->finish();
+    if (int idx = observer->get_value(); idx != -1) {
+      auto* act = activities.at(idx);
+      act->simcalls_.push_back(&issuer->simcall_);
+      observer->set_result(idx);
+      act->set_state(State::DONE);
+      act->finish();
+    }
     return;
   }
 
@@ -237,6 +236,4 @@ void intrusive_ptr_release(ActivityImpl* activity)
     delete activity;
   }
 }
-}
-}
-} // namespace simgrid::kernel::activity::
+} // namespace simgrid::kernel::activity