X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84e824746638f2b4c32c315bcfce655098d4e80b..8da27cf4b7b05ed45b085557d76cbb0b6dd34cd9:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index ff7dbe359e..5cc8b4930e 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,23 +1,23 @@ -/* Copyright (c) 2008-2019. 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 "mc/mc.h" -#include "simgrid/config.h" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" +#include "src/mc/checker/SimcallInspector.hpp" #include "src/mc/mc_config.hpp" -#include "src/mc/mc_forward.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" +#include "src/mc/Session.hpp" +#include "src/mc/remote/RemoteSimulation.hpp" using simgrid::mc::remote; #endif @@ -44,14 +44,14 @@ void wait_for_requests() while (not simix_global->actors_to_run.empty()) { simix_global->run_all_actors(); for (smx_actor_t const& process : simix_global->actors_that_ran) { - smx_simcall_t req = &process->simcall; - if (req->call != SIMCALL_NONE && not simgrid::mc::request_is_visible(req)) - SIMIX_simcall_handle(req, 0); + const s_smx_simcall* req = &process->simcall_; + if (req->call_ != simix::Simcall::NONE && not simgrid::mc::request_is_visible(req)) + process->simcall_handle(0); } } #if SIMGRID_HAVE_MC xbt_dynar_reset(simix_global->actors_vector); - for (std::pair const& kv : simix_global->process_list) { + for (std::pair const& kv : simix_global->process_list) { xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second); } #endif @@ -71,24 +71,29 @@ void wait_for_requests() // 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 mc_model_checker->process().actor_is_enabled(actor->get_pid()); + return simgrid::mc::session->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; + smx_simcall_t req = &actor->simcall_; - switch (req->call) { - case SIMCALL_NONE: + if (req->inspector_ != nullptr) + return req->inspector_->is_enabled(); + + using simix::Simcall; + switch (req->call_) { + case Simcall::NONE: return false; - case SIMCALL_COMM_WAIT: { + case Simcall::COMM_WAIT: { /* FIXME: check also that src and dst processes are not suspended */ - simgrid::kernel::activity::CommImpl* act = - static_cast(simcall_comm_wait__getraw__comm(req)); + const kernel::activity::CommImpl* act = 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), @@ -103,26 +108,26 @@ bool actor_is_enabled(smx_actor_t actor) 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) { - auto* comm = comms[index]; + auto const* comm = comms[index]; if (comm->src_actor_ && comm->dst_actor_) return true; } return false; } - case SIMCALL_MUTEX_LOCK: { - smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); + case Simcall::MUTEX_LOCK: { + const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req); - if (mutex->owner_ == nullptr) + if (mutex->get_owner() == nullptr) return true; - return mutex->owner_->get_pid() == req->issuer->get_pid(); + return mutex->get_owner()->get_pid() == req->issuer_->get_pid(); } - case SIMCALL_SEM_ACQUIRE: { + 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"); @@ -130,7 +135,7 @@ bool actor_is_enabled(smx_actor_t actor) return true; } - case SIMCALL_COND_WAIT: { + 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"); @@ -147,16 +152,18 @@ bool actor_is_enabled(smx_actor_t actor) /* 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(smx_simcall_t req) +bool request_is_visible(const s_smx_simcall* req) { #if SIMGRID_HAVE_MC xbt_assert(mc_model_checker == nullptr, "This should be called from the client side"); #endif - 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 || - 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->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; } } @@ -164,10 +171,9 @@ bool request_is_visible(smx_simcall_t req) 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); + if (not MC_is_active() && not MC_record_replay_is_active()) { + static simgrid::xbt::random::XbtRandom prng; + return prng.uniform_int(min, max); } - return simcall->mc_value; + return simcall->mc_value_; }