X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19c58cbb49a4c58174169566b13aafb2b873fd81..706dd4584b4002e0d948b81d103dd5c4b70db077:/src/mc/mc_base.cpp?ds=sidebyside diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index f68fc96a9b..df068fa76f 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/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" + #if HAVE_MC #include "src/mc/mc_request.h" #include "src/mc/Process.hpp" @@ -35,10 +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 :) */ - /* FIXME: return mc_current_state->executed_transition->random.value; */ +#endif return simcall_mc_random(min, max); } @@ -47,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; @@ -67,24 +77,24 @@ void wait_for_requests(void) 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::simix::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 @@ -95,18 +105,20 @@ 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::simix::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))); @@ -118,7 +130,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 @@ -128,15 +140,17 @@ 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::simix::Comm*); + if (act->src_proc && act->dst_proc) return true; } return false; @@ -149,21 +163,24 @@ bool request_is_enabled(smx_simcall_t req) 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) { + if (mc_model_checker != nullptr) { mc_model_checker->process().read(&temp_mutex, remote(mutex)); mutex = &temp_mutex; } #endif + if(mutex->owner == nullptr) return true; - else #if 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.resolveProcess(simgrid::mc::remote(mutex->owner))->pid + == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid; + } #endif + else + return mutex->owner->pid == req->issuer->pid; } default: @@ -214,30 +231,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 -} - -} -}