X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aabd69e2ec25a7e7e1b6e3d7d86f531c42f4fca9..7ab0c3292a34fe46da96475255faeadb956b4409:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index f68fc96a9b..681efc334e 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,44 +1,29 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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 -#include -#include -#include - -#include - +#include "mc/mc.h" #include "src/mc/mc_base.h" -#include "src/simix/smx_private.h" #include "src/mc/mc_replay.h" -#include "mc/mc.h" -#include "src/mc/mc_protocol.h" +#include "src/simix/smx_private.h" -#if HAVE_MC -#include "src/mc/mc_request.h" -#include "src/mc/Process.hpp" +#if SIMGRID_HAVE_MC #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_smx.h" -#endif -#if HAVE_MC using simgrid::mc::remote; #endif -XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); +XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories"); int MC_random(int min, int max) { - xbt_assert(mc_mode != MC_MODE_SERVER); - /* TODO, if the MC is disabled we do not really need to make a simcall for - * this :) */ - /* FIXME: return mc_current_state->executed_transition->random.value; */ +#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); } @@ -47,9 +32,11 @@ namespace mc { void wait_for_requests(void) { - assert(mc_mode != MC_MODE_SERVER); +#if SIMGRID_HAVE_MC + xbt_assert(mc_model_checker == nullptr); +#endif - smx_process_t process; + smx_actor_t process; smx_simcall_t req; unsigned int iter; @@ -61,30 +48,47 @@ void wait_for_requests(void) SIMIX_simcall_handle(req, 0); } } +#if SIMGRID_HAVE_MC + xbt_dynar_reset(simix_global->actors_vector); + for (std::pair 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 + * + * It is used in the model-checker to not get into self-deadlock where it would execute a never ending transition. + * + * Only WAIT operations (on comm, on mutex, etc) can ever return false because they could lock the MC exploration. + * Wait operations are OK and return true in only two situations: + * - 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. + * + */ // Called from both MCer and MCed: bool request_is_enabled(smx_simcall_t req) { unsigned int index = 0; - smx_synchro_t act = 0; -#if HAVE_MC - s_smx_synchro_t temp_synchro; -#endif + // TODO, add support for the subtypes? switch (req->call) { case SIMCALL_NONE: return false; case SIMCALL_COMM_WAIT: + { /* FIXME: check also that src and dst processes are not suspended */ - act = simcall_comm_wait__get__comm(req); + simgrid::kernel::activity::Comm *act = + static_cast(simcall_comm_wait__get__comm(req)); -#if HAVE_MC +#if SIMGRID_HAVE_MC // Fetch from MCed memory: - if (mc_mode == MC_MODE_SERVER) { - mc_model_checker->process().read(&temp_synchro, remote(act)); - act = &temp_synchro; + // HACK, type puning + if (mc_model_checker != nullptr) { + simgrid::mc::Remote temp_comm; + mc_model_checker->process().read(temp_comm, remote(act)); + act = static_cast(temp_comm.getBuffer()); } #endif @@ -95,18 +99,21 @@ bool request_is_enabled(smx_simcall_t req) return true; } /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ - else if (act->comm.detached && act->comm.src_proc == nullptr - && act->comm.type == SIMIX_COMM_READY) - return (act->comm.dst_proc != nullptr); - return (act->comm.src_proc && act->comm.dst_proc); + 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); + } case SIMCALL_COMM_WAITANY: { xbt_dynar_t comms; -#if HAVE_MC + simgrid::kernel::activity::Comm *act = + static_cast(simcall_comm_wait__get__comm(req)); +#if SIMGRID_HAVE_MC s_xbt_dynar_t comms_buffer; size_t buffer_size = 0; - if (mc_mode == MC_MODE_SERVER) { + if (mc_model_checker != nullptr) { // Read dynar: mc_model_checker->process().read( &comms_buffer, remote(simcall_comm_waitany__get__comms(req))); @@ -118,7 +125,7 @@ bool request_is_enabled(smx_simcall_t req) // Read all the dynar buffer: char buffer[buffer_size]; - if (mc_mode == MC_MODE_SERVER) + if (mc_model_checker != nullptr) mc_model_checker->process().read_bytes(buffer, sizeof(buffer), remote(comms->data)); #else @@ -126,49 +133,67 @@ bool request_is_enabled(smx_simcall_t req) #endif for (index = 0; index < comms->used; ++index) { -#if HAVE_MC +#if SIMGRID_HAVE_MC // Fetch act from MCed memory: - if (mc_mode == MC_MODE_SERVER) { + // HACK, type puning + simgrid::mc::Remote temp_comm; + if (mc_model_checker != nullptr) { memcpy(&act, buffer + comms->elmsize * index, sizeof(act)); - mc_model_checker->process().read(&temp_synchro, remote(act)); - act = &temp_synchro; + mc_model_checker->process().read(temp_comm, remote(act)); + act = static_cast(temp_comm.getBuffer()); } else #endif - act = xbt_dynar_get_as(comms, index, smx_synchro_t); - if (act->comm.src_proc && act->comm.dst_proc) + act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::Comm*); + if (act->src_proc && act->dst_proc) return true; } return false; } - case SIMCALL_MUTEX_TRYLOCK: - return true; - case SIMCALL_MUTEX_LOCK: { smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); -#if HAVE_MC - s_smx_mutex_t temp_mutex; - if (mc_mode == MC_MODE_SERVER) { - mc_model_checker->process().read(&temp_mutex, remote(mutex)); - mutex = &temp_mutex; +#if SIMGRID_HAVE_MC + simgrid::mc::Remote temp_mutex; + if (mc_model_checker != nullptr) { + mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex)); + mutex = temp_mutex.getBuffer(); } #endif + if(mutex->owner == nullptr) return true; - else -#if HAVE_MC +#if SIMGRID_HAVE_MC + else if (mc_model_checker != nullptr) { + simgrid::mc::Process& modelchecked = mc_model_checker->process(); // TODO, *(mutex->owner) :/ - return MC_smx_resolve_process(mutex->owner)->pid == - MC_smx_resolve_process(req->issuer)->pid; -#else - return mutex->owner->pid == req->issuer->pid; + return modelchecked.resolveActor(simgrid::mc::remote(mutex->owner))->pid == + modelchecked.resolveActor(simgrid::mc::remote(req->issuer))->pid; + } #endif + else + return mutex->owner->pid == req->issuer->pid; } - default: - /* The rest of the requests are always enabled */ - return true; + case SIMCALL_SEM_ACQUIRE: { + static int warned = 0; + if (!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 (!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; } } @@ -214,30 +239,3 @@ int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max) return prng_random(min, max); return simcall->mc_value; } - -namespace simgrid { -namespace mc { - -void handle_simcall(smx_simcall_t req, int value) -{ -#if !HAVE_MC - SIMIX_simcall_handle(req, value); -#else - if (mc_mode == MC_MODE_CLIENT) { - SIMIX_simcall_handle(req, value); - return; - } - - for (auto& pi : mc_model_checker->process().smx_process_infos) - if (req == &pi.copy.simcall) { - mc_model_checker->simcall_handle( - mc_model_checker->process(), pi.copy.pid, value); - return; - } - - xbt_die("Could not find the request"); -#endif -} - -} -}