X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/872d65264714799b25eb231609c3f05bae3d03dc..f35db13138682b1be530a509d1eeadeafff84ca7:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index df6234ac63..cc57a3cc8e 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,13 +1,10 @@ -/* 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 @@ -16,27 +13,25 @@ #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/mc/remote/mc_protocol.h" +#include "src/simix/smx_private.h" -#include "src/simix/Synchro.h" -#include "src/simix/SynchroIo.hpp" -#include "src/simix/SynchroComm.hpp" -#include "src/simix/SynchroRaw.hpp" -#include "src/simix/SynchroSleep.hpp" -#include "src/simix/SynchroExec.hpp" +#include "src/kernel/activity/ActivityImpl.hpp" +#include "src/kernel/activity/SynchroIo.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroExec.hpp" #if HAVE_MC #include "src/mc/mc_request.h" #include "src/mc/Process.hpp" #include "src/mc/ModelChecker.hpp" #include "src/mc/mc_smx.h" -#endif -#if HAVE_MC using simgrid::mc::remote; #endif @@ -61,7 +56,7 @@ void wait_for_requests(void) xbt_assert(mc_model_checker == nullptr); #endif - smx_process_t process; + smx_actor_t process; smx_simcall_t req; unsigned int iter; @@ -73,8 +68,24 @@ void wait_for_requests(void) SIMIX_simcall_handle(req, 0); } } +#if 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) { @@ -85,18 +96,24 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_NONE: return false; + case SIMCALL_SEM_ACQUIRE: + xbt_die("Don't use semaphores in model-checked code, it's not supported yet"); + case SIMCALL_COND_WAIT: + xbt_die("Don't use condition variables in model-checked code, it's not supported yet"); + case SIMCALL_COMM_WAIT: { /* FIXME: check also that src and dst processes are not suspended */ - simgrid::simix::Comm *act = static_cast(simcall_comm_wait__get__comm(req)); + simgrid::kernel::activity::Comm *act = + static_cast(simcall_comm_wait__get__comm(req)); #if HAVE_MC // Fetch from MCed memory: // HACK, type puning - simgrid::mc::Remote temp_comm; if (mc_model_checker != nullptr) { + simgrid::mc::Remote temp_comm; mc_model_checker->process().read(temp_comm, remote(act)); - act = static_cast(temp_comm.data()); + act = static_cast(temp_comm.getBuffer()); } #endif @@ -115,9 +132,10 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_COMM_WAITANY: { xbt_dynar_t comms; - simgrid::simix::Comm *act = static_cast(simcall_comm_wait__get__comm(req)); -#if HAVE_MC + simgrid::kernel::activity::Comm *act = + static_cast(simcall_comm_wait__get__comm(req)); +#if HAVE_MC s_xbt_dynar_t comms_buffer; size_t buffer_size = 0; if (mc_model_checker != nullptr) { @@ -143,31 +161,28 @@ bool request_is_enabled(smx_simcall_t req) #if HAVE_MC // Fetch act from MCed memory: // HACK, type puning - simgrid::mc::Remote temp_comm; + simgrid::mc::Remote temp_comm; if (mc_model_checker != nullptr) { memcpy(&act, buffer + comms->elmsize * index, sizeof(act)); mc_model_checker->process().read(temp_comm, remote(act)); - act = static_cast(temp_comm.data()); + act = static_cast(temp_comm.getBuffer()); } else #endif - act = xbt_dynar_get_as(comms, index, simgrid::simix::Comm*); + 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; + simgrid::mc::Remote temp_mutex; if (mc_model_checker != nullptr) { - mc_model_checker->process().read(&temp_mutex, remote(mutex)); - mutex = &temp_mutex; + mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex)); + mutex = temp_mutex.getBuffer(); } #endif @@ -177,8 +192,8 @@ bool request_is_enabled(smx_simcall_t req) else if (mc_model_checker != nullptr) { simgrid::mc::Process& modelchecked = mc_model_checker->process(); // TODO, *(mutex->owner) :/ - return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid - == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid; + return modelchecked.resolveActor(simgrid::mc::remote(mutex->owner))->pid == + modelchecked.resolveActor(simgrid::mc::remote(req->issuer))->pid; } #endif else