-/* 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. */
#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Activity.hpp>
#include <simgrid/s4u/Engine.hpp>
#include "src/kernel/activity/ActivityImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/Synchro.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_activity, kernel, "Kernel activity-related synchronization");
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
ActivityImpl::~ActivityImpl()
{
XBT_DEBUG("Destroy activity %p", this);
}
-void ActivityImpl::register_simcall(smx_simcall_t simcall)
+void ActivityImpl::register_simcall(actor::Simcall* simcall)
{
simcalls_.push_back(simcall);
simcall->issuer_->waiting_synchro_ = this;
}
-void ActivityImpl::unregister_simcall(smx_simcall_t simcall)
+void ActivityImpl::unregister_simcall(actor::Simcall* simcall)
{
// Remove the first occurrence of simcall:
auto j = boost::range::find(simcalls_, simcall);
bool ActivityImpl::test(actor::ActorImpl* issuer)
{
- // Associate this simcall to the synchro
- auto* observer = dynamic_cast<kernel::actor::ActivityTestSimcall*>(issuer->simcall_.observer_);
- if (observer)
- register_simcall(&issuer->simcall_);
-
if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
issuer->exception_ = nullptr; // Do not propagate exception in that case
return true;
}
- if (observer) {
+ if (auto* observer = dynamic_cast<kernel::actor::ActivityTestSimcall*>(issuer->simcall_.observer_))
observer->set_result(false);
- issuer->waiting_synchro_ = nullptr;
- unregister_simcall(&issuer->simcall_);
- issuer->simcall_answer();
- }
+
return false;
}
ssize_t ActivityImpl::test_any(actor::ActorImpl* issuer, const std::vector<ActivityImpl*>& activities)
{
+ auto* observer = dynamic_cast<kernel::actor::ActivityTestanySimcall*>(issuer->simcall_.observer_);
+ xbt_assert(observer != nullptr);
+
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = issuer->simcall_.mc_value_;
+ int idx = observer->get_value();
xbt_assert(idx == -1 || activities[idx]->test(issuer));
return idx;
}
for (std::size_t i = 0; i < activities.size(); ++i) {
if (activities[i]->test(issuer)) {
- auto* observer = dynamic_cast<kernel::actor::ActivityTestanySimcall*>(issuer->simcall_.observer_);
- xbt_assert(observer != nullptr);
observer->set_result(i);
- issuer->simcall_answer();
return i;
}
}
- issuer->simcall_answer();
return -1;
}
if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
} else {
- auto* comm = dynamic_cast<CommImpl*>(this);
- if (comm != nullptr) {
- resource::Action* sleep = issuer->get_host()->get_cpu()->sleep(timeout);
- sleep->set_activity(comm);
+ /* 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_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_);
+ issuer->waiting_synchro_ = nullptr;
+ issuer->exception_ = nullptr;
+ auto* observer = dynamic_cast<kernel::actor::ActivityWaitSimcall*>(issuer->simcall_.observer_);
+ xbt_assert(observer != nullptr);
+ observer->set_result(true); // Returns that the wait_for timeouted
+ }));
+ synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
+ synchro->register_simcall(&issuer->simcall_);
}
- /* we need a sleep action (even when the timeout is infinite) to be notified of host failures */
- RawImplPtr synchro(new RawImpl([this, issuer]() {
- this->unregister_simcall(&issuer->simcall_);
- issuer->waiting_synchro_ = nullptr;
- issuer->exception_ = nullptr;
- auto* observer = dynamic_cast<kernel::actor::ActivityWaitSimcall*>(issuer->simcall_.observer_);
- xbt_assert(observer != nullptr);
- observer->set_result(true);
- }));
- synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
- synchro->register_simcall(&issuer->simcall_);
}
}
void ActivityImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<ActivityImpl*>& activities, double timeout)
{
XBT_DEBUG("Wait for execution of any synchro");
+ if (MC_is_active() || MC_record_replay_is_active()) {
+ 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");
+ 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;
+ }
+
if (timeout < 0.0) {
issuer->simcall_.timeout_cb_ = nullptr;
} else {
return;
XBT_VERB("This activity is suspended (remain: %f)", surf_action_->get_remains());
surf_action_->suspend();
- on_suspended(*this);
+ s4u::Activity::on_suspended(*get_iface());
}
void ActivityImpl::resume()
return;
XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains());
surf_action_->resume();
- on_resumed(*this);
+ s4u::Activity::on_resumed(*get_iface());
}
void ActivityImpl::cancel()
state_ = State::CANCELED;
}
-void ActivityImpl::handle_activity_waitany(smx_simcall_t simcall)
+void ActivityImpl::handle_activity_waitany(actor::Simcall* simcall)
{
/* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany
* list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
if (not MC_is_active() && not MC_record_replay_is_active()) {
auto element = std::find(activities.begin(), activities.end(), this);
int rank = element != activities.end() ? static_cast<int>(std::distance(activities.begin(), element)) : -1;
- auto* observer = dynamic_cast<kernel::actor::ActivityWaitanySimcall*>(simcall->observer_);
observer->set_result(rank);
}
}
delete activity;
}
}
-xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_resumed;
-xbt::signal<void(ActivityImpl const&)> ActivityImpl::on_suspended;
-}
-}
-} // namespace simgrid::kernel::activity::
+} // namespace simgrid::kernel::activity
