-/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2021. 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 "src/mc/mc_base.h"
+#include "src/mc/mc_base.hpp"
#include "mc/mc.h"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
-#include "src/mc/checker/SimcallInspector.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/mc/mc_config.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_private.hpp"
#include "xbt/random.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
#include "src/mc/Session.hpp"
-#include "src/mc/remote/RemoteSimulation.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
using simgrid::mc::remote;
#endif
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr);
#endif
- /* TODO, if the MC is disabled we do not really need to make a simcall for this :) */
- return simcall_mc_random(min, max);
+ if (not MC_is_active() && not MC_record_replay_is_active()) { // no need to do a simcall in this case
+ static simgrid::xbt::random::XbtRandom prng;
+ return prng.uniform_int(min, max);
+ }
+ simgrid::kernel::actor::RandomSimcall observer{simgrid::kernel::actor::ActorImpl::self(), min, max};
+ return simgrid::kernel::actor::simcall([&observer] { return observer.get_value(); }, &observer);
}
namespace simgrid {
namespace mc {
-void wait_for_requests()
+void execute_actors()
{
+ auto* engine = kernel::EngineImpl::get_instance();
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This must be called from the client");
#endif
- while (not simix_global->actors_to_run.empty()) {
- simix_global->run_all_actors();
- for (smx_actor_t const& process : simix_global->actors_that_ran) {
- const s_smx_simcall* req = &process->simcall_;
- if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
- process->simcall_handle(0);
+ while (engine->has_actors_to_run()) {
+ engine->run_all_actors();
+ for (auto const& actor : engine->get_actors_that_ran()) {
+ const s_smx_simcall* req = &actor->simcall_;
+ if (req->call_ != simix::Simcall::NONE && not simgrid::mc::request_is_visible(req))
+ actor->simcall_handle(0);
}
}
#if SIMGRID_HAVE_MC
- xbt_dynar_reset(simix_global->actors_vector);
- for (std::pair<const aid_t, smx_actor_t> const& kv : simix_global->process_list) {
- xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second);
+ engine->reset_actor_dynar();
+ for (auto const& kv : engine->get_actor_list()) {
+ auto actor = kv.second;
+ if (actor->simcall_.observer_ != nullptr)
+ actor->simcall_.mc_max_consider_ = actor->simcall_.observer_->get_max_consider();
+ engine->add_actor_to_dynar(actor);
}
#endif
}
// Called from both MCer and MCed:
bool actor_is_enabled(smx_actor_t actor)
{
+// #del
#if SIMGRID_HAVE_MC
// If in the MCer, ask the client app since it has all the data
if (mc_model_checker != nullptr) {
- return simgrid::mc::session->actor_is_enabled(actor->get_pid());
+ return simgrid::mc::session_singleton->actor_is_enabled(actor->get_pid());
}
#endif
+// #
// Now, we are in the client app, no need for remote memory reading.
smx_simcall_t req = &actor->simcall_;
- if (req->inspector_ != nullptr)
- return req->inspector_->is_enabled();
+ if (req->observer_ != nullptr)
+ return req->observer_->is_enabled();
+ using simix::Simcall;
switch (req->call_) {
- case SIMCALL_NONE:
+ case Simcall::NONE:
return false;
- case SIMCALL_COMM_WAIT: {
+ case Simcall::COMM_WAIT: {
/* FIXME: check also that src and dst processes are not suspended */
const kernel::activity::CommImpl* act = simcall_comm_wait__getraw__comm(req);
return true;
}
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
- else if (act->detached() && act->src_actor_ == nullptr &&
- act->type_ == simgrid::kernel::activity::CommImpl::Type::READY)
+ else if (act->detached() && act->src_actor_ == nullptr && act->state_ == simgrid::kernel::activity::State::READY)
return (act->dst_actor_ != nullptr);
return (act->src_actor_ && act->dst_actor_);
}
- case SIMCALL_COMM_WAITANY: {
+ case Simcall::COMM_WAITANY: {
simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(req);
size_t count = simcall_comm_waitany__get__count(req);
for (unsigned int index = 0; index < count; ++index) {
return false;
}
- case SIMCALL_MUTEX_LOCK: {
- const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req);
-
- if (mutex->get_owner() == nullptr)
- return true;
- return mutex->get_owner()->get_pid() == req->issuer_->get_pid();
- }
-
- case SIMCALL_SEM_ACQUIRE: {
- static int warned = 0;
- if (not warned)
- XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk");
- warned = 1;
- return true;
- }
-
- case SIMCALL_COND_WAIT: {
- static int warned = 0;
- if (not warned)
- XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
- warned = 1;
- return true;
- }
-
default:
/* The rest of the requests are always enabled */
return true;
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
#endif
+ if (req->observer_ != nullptr)
+ return req->observer_->is_visible();
- return (req->inspector_ != nullptr && req->inspector_->is_visible()) || req->call_ == SIMCALL_COMM_ISEND ||
- req->call_ == SIMCALL_COMM_IRECV || req->call_ == SIMCALL_COMM_WAIT || req->call_ == SIMCALL_COMM_WAITANY ||
- req->call_ == SIMCALL_COMM_TEST || req->call_ == SIMCALL_COMM_TESTANY || req->call_ == SIMCALL_MC_RANDOM ||
- req->call_ == SIMCALL_MUTEX_LOCK || req->call_ == SIMCALL_MUTEX_TRYLOCK || req->call_ == SIMCALL_MUTEX_UNLOCK;
+ using simix::Simcall;
+ return req->call_ == Simcall::COMM_ISEND || req->call_ == Simcall::COMM_IRECV || req->call_ == Simcall::COMM_WAIT ||
+ req->call_ == Simcall::COMM_WAITANY || req->call_ == Simcall::COMM_TEST || req->call_ == Simcall::COMM_TESTANY;
}
}
}
-
-int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
-{
- if (not MC_is_active() && MC_record_path.empty()) {
- static simgrid::xbt::random::XbtRandom prng;
- return prng.uniform_int(min, max);
- }
- return simcall->mc_value_;
-}
