X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d51fbcc2374aec305440e6456aee54c0a2df5d3..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 384283fd33..6b498b61c5 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,20 +1,22 @@ -/* Copyright (c) 2008-2018. 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 - -#include "mc/mc.h" #include "src/mc/mc_base.h" -#include "src/mc/mc_config.hpp" +#include "mc/mc.h" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/MutexImpl.hpp" +#include "src/mc/checker/SimcallInspector.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_private.hpp" -#include "src/kernel/activity/MutexImpl.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" using simgrid::mc::remote; #endif @@ -38,17 +40,17 @@ void wait_for_requests() #if SIMGRID_HAVE_MC xbt_assert(mc_model_checker == nullptr, "This must be called from the client"); #endif - while (not simix_global->process_to_run.empty()) { - SIMIX_process_runall(); - for (smx_actor_t const& process : simix_global->process_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); + 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_ != 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 @@ -68,56 +70,63 @@ 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->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_; + + if (req->inspector_ != nullptr) + return req->inspector_->is_enabled(); - switch (req->call) { - case SIMCALL_NONE: + 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 (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_proc == nullptr && act->type == SIMIX_COMM_READY) - return (act->dst_proc != nullptr); - return (act->src_proc && act->dst_proc); + 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: { - xbt_dynar_t comms = simcall_comm_waitany__get__comms(req); - for (unsigned int index = 0; index < comms->used; ++index) { - simgrid::kernel::activity::CommImpl* act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*); - if (act->src_proc && act->dst_proc) + 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; } - 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->pid == req->issuer->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"); @@ -125,7 +134,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"); @@ -142,43 +151,28 @@ 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; } } } -static int prng_random(int min, int max) -{ - unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1; - unsigned long input_size = (unsigned long) RAND_MAX + 1; - unsigned long reject_size = input_size % output_size; - unsigned long accept_size = input_size - reject_size; // module*accept_size - - // Use rejection in order to avoid skew - unsigned long x; - do { -#ifndef _WIN32 - x = (unsigned long) random(); -#else - x = (unsigned long) rand(); -#endif - } while( x >= accept_size ); - return min + (x % output_size); -} - int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max) { - if (not MC_is_active() && MC_record_path.empty()) - return prng_random(min, max); - return simcall->mc_value; + 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_; }