-/* 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()
{
void ActivityImpl::clean_action()
{
- if (surf_action_) {
- surf_action_->unref();
- surf_action_ = nullptr;
+ if (model_action_) {
+ model_action_->unref();
+ model_action_ = nullptr;
}
}
double ActivityImpl::get_remaining() const
{
- return surf_action_ ? surf_action_->get_remains() : 0;
+ return model_action_ ? model_action_->get_remains() : 0;
}
const char* ActivityImpl::get_state_str() const
if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
} else {
+ /* As Messages in Message Queues are virtually instantaneous, we do not need a timeout */
+ /* Or maybe we do, and will have to implement a specific way to handle them is need arises */
+ if (dynamic_cast<MessImpl*>(this) != nullptr)
+ return;
/* 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_.reset(sleep_action);
else
- comm->dst_timeout_ = sleep;
+ comm->dst_timeout_.reset(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;
}
void ActivityImpl::suspend()
{
- if (surf_action_ == nullptr)
- return;
- XBT_VERB("This activity is suspended (remain: %f)", surf_action_->get_remains());
- surf_action_->suspend();
- s4u::Activity::on_suspended(*get_iface());
+ XBT_VERB("This activity is suspended (remain: %f)", model_action_->get_remains());
+ get_iface()->fire_on_suspend();
+ get_iface()->fire_on_this_suspend();
+ model_action_->suspend();
}
void ActivityImpl::resume()
{
- if (surf_action_ == nullptr)
+ if (model_action_ == nullptr)
return;
- XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains());
- surf_action_->resume();
- s4u::Activity::on_resumed(*get_iface());
+ XBT_VERB("This activity is resumed (remain: %f)", model_action_->get_remains());
+ get_iface()->fire_on_resume();
+ get_iface()->fire_on_this_resume();
+ model_action_->resume();
}
void ActivityImpl::cancel()
{
XBT_VERB("Activity %p is canceled", this);
- if (surf_action_ != nullptr)
- surf_action_->cancel();
+ if (model_action_ != nullptr)
+ model_action_->cancel();
state_ = State::CANCELED;
}
delete activity;
}
}
-}
-}
-} // namespace simgrid::kernel::activity::
+
+} // namespace simgrid::kernel::activity