X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..96d605fde63f72480bf570f7bc7609e2954cb2d7:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index b76dc7c3af..91012ba602 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,23 +1,23 @@ -/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2022. 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 +#include "xbt/random.hpp" #if SIMGRID_HAVE_MC #include "src/mc/ModelChecker.hpp" -#include "src/mc/remote/RemoteClient.hpp" - -using simgrid::mc::remote; +#include "src/mc/api/RemoteApp.hpp" +#include "src/mc/remote/RemoteProcess.hpp" #endif XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories"); @@ -27,32 +27,28 @@ int MC_random(int min, int max) #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_answered([&observer] { return observer.get_value(); }, &observer); } -namespace simgrid { -namespace mc { +namespace simgrid::mc { -void wait_for_requests() +void execute_actors() { -#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); + auto* engine = kernel::EngineImpl::get_instance(); + + while (engine->has_actors_to_run()) { + engine->run_all_actors(); + for (auto const& actor : engine->get_actors_that_ran()) { + const kernel::actor::Simcall* req = &actor->simcall_; + if (req->call_ != kernel::actor::Simcall::Type::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& kv : simix_global->process_list) { - xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second); - } -#endif } /** @brief returns if there this transition can proceed in a finite amount of time @@ -64,111 +60,40 @@ void wait_for_requests() * - if the wait will succeed immediately (if both peer of the comm are there already or if the mutex is available) * - if a timeout is provided, because we can fire the timeout if the transition is not ready without blocking in this * transition for ever. - * + * This is controlled in the is_enabled() method of the corresponding observers. */ // Called from both MCer and MCed: -bool actor_is_enabled(smx_actor_t actor) +bool actor_is_enabled(kernel::actor::ActorImpl* actor) { #if SIMGRID_HAVE_MC - // If in the MCer, ask the client app since it has all the data - if (mc_model_checker != nullptr) { - return mc_model_checker->process().actor_is_enabled(actor->get_pid()); - } + xbt_assert(mc_model_checker == nullptr, "This should be called from the client side"); #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(); - - switch (req->call_) { - case SIMCALL_NONE: - return false; + kernel::actor::Simcall* req = &actor->simcall_; - case SIMCALL_COMM_WAIT: { - /* FIXME: check also that src and dst processes are not suspended */ - const kernel::activity::CommImpl* act = - static_cast(simcall_comm_wait__getraw__comm(req)); - - if (act->src_timeout_ || act->dst_timeout_) { - /* If it has a timeout it will be always be enabled (regardless of who declared the timeout), - * because even if the communication is not ready, it can timeout and won't block. */ - if (_sg_mc_timeout == 1) - 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) - return (act->dst_actor_ != nullptr); - return (act->src_actor_ && act->dst_actor_); - } - - 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) { - auto const* comm = comms[index]; - if (comm->src_actor_ && comm->dst_actor_) - return true; - } - return false; - } + if (req->observer_ != nullptr) + return req->observer_->is_enabled(); - 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 (req->call_ == kernel::actor::Simcall::Type::NONE) + return false; + else + /* The rest of the requests are always enabled */ + return true; } /* This is the list of requests that are visible from the checker algorithm. * Any other requests are handled right away on the application side. */ -bool request_is_visible(const s_smx_simcall* req) +bool request_is_visible(const kernel::actor::Simcall* req) { #if SIMGRID_HAVE_MC xbt_assert(mc_model_checker == nullptr, "This should be called from the client side"); #endif - - 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; -} - -} + if (req->observer_ != nullptr) + return req->observer_->is_visible(); + else + return false; } -int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max) -{ - if (not MC_is_active() && MC_record_path.empty()) { - static std::default_random_engine rnd_engine; - std::uniform_int_distribution prng(min, max); - return prng(rnd_engine); - } - return simcall->mc_value_; -} +} // namespace simgrid::mc