-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_activity, kernel, "Kernel activity-related synchronization");
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
ActivityImpl::~ActivityImpl()
{
/* 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_);
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;
}
delete activity;
}
}
-}
-}
-} // namespace simgrid::kernel::activity::
+} // namespace simgrid::kernel::activity