X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05257c8e62399d484d4971dfc4ca4a5a7564cf08..4e6e8e102053ba7caf8a3663994bbc8a11047c60:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 4dcc139da8..b82c3f2554 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -20,6 +20,13 @@ #include "mc/mc.h" #include "src/mc/mc_protocol.h" +#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" @@ -35,9 +42,11 @@ XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); int MC_random(int min, int max) { - xbt_assert(mc_mode != MC_MODE_SERVER); +#if HAVE_MC + xbt_assert(mc_model_checker == nullptr); /* TODO, if the MC is disabled we do not really need to make a simcall for * this :) */ +#endif return simcall_mc_random(min, max); } @@ -46,7 +55,9 @@ namespace mc { void wait_for_requests(void) { - assert(mc_mode != MC_MODE_SERVER); +#if HAVE_MC + xbt_assert(mc_model_checker == nullptr); +#endif smx_process_t process; smx_simcall_t req; @@ -62,28 +73,44 @@ void wait_for_requests(void) } } +/** @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_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 */ - act = 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: - if (mc_mode == MC_MODE_SERVER) { - mc_model_checker->process().read(&temp_synchro, remote(act)); - act = &temp_synchro; + // HACK, type puning + simgrid::mc::Remote temp_comm; + if (mc_model_checker != nullptr) { + mc_model_checker->process().read(temp_comm, remote(act)); + act = static_cast(temp_comm.getBuffer()); } #endif @@ -94,18 +121,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; + 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_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))); @@ -117,7 +147,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 @@ -127,40 +157,41 @@ bool request_is_enabled(smx_simcall_t req) for (index = 0; index < comms->used; ++index) { #if 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; + 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; #if HAVE_MC - else if (mc_mode == MC_MODE_SERVER) + else if (mc_model_checker != nullptr) { + simgrid::mc::Process& modelchecked = mc_model_checker->process(); // TODO, *(mutex->owner) :/ - return MC_smx_resolve_process(simgrid::mc::remote(mutex->owner))->pid == - MC_smx_resolve_process(simgrid::mc::remote(req->issuer))->pid; + return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid + == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid; + } #endif else return mutex->owner->pid == req->issuer->pid;