X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d33e7a563a884247bff85406dcc589a70a162e79..403af5e6247ce6452b721f418a5b41e4548efac4:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index e567c57397..eebd47b5eb 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -8,7 +8,7 @@ #include "mc/mc.h" #include "src/mc/mc_base.h" #include "src/mc/mc_replay.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #if SIMGRID_HAVE_MC #include "src/mc/ModelChecker.hpp" @@ -33,24 +33,19 @@ namespace mc { void wait_for_requests() { #if SIMGRID_HAVE_MC - xbt_assert(mc_model_checker == nullptr); + xbt_assert(mc_model_checker == nullptr, "This must be called from the client"); #endif - - smx_actor_t process; - smx_simcall_t req; - unsigned int iter; - - while (not xbt_dynar_is_empty(simix_global->process_to_run)) { + while (not simix_global->process_to_run.empty()) { SIMIX_process_runall(); - xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { - req = &process->simcall; + 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); } } #if SIMGRID_HAVE_MC xbt_dynar_reset(simix_global->actors_vector); - for (std::pair 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 @@ -70,8 +65,15 @@ void wait_for_requests() // Called from both MCer and MCed: bool actor_is_enabled(smx_actor_t actor) { +#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); + } +#endif + + // Now, we are in the client app, no need for remote memory reading. smx_simcall_t req = &actor->simcall; - // TODO, add support for the subtypes? switch (req->call) { case SIMCALL_NONE: @@ -82,16 +84,6 @@ bool actor_is_enabled(smx_actor_t actor) simgrid::kernel::activity::CommImpl* act = static_cast(simcall_comm_wait__getraw__comm(req)); -#if SIMGRID_HAVE_MC - // Fetch from MCed memory: - // 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 - 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. */ @@ -105,42 +97,9 @@ bool actor_is_enabled(smx_actor_t actor) } case SIMCALL_COMM_WAITANY: { - xbt_dynar_t comms; - simgrid::kernel::activity::CommImpl* act = - static_cast(simcall_comm_wait__getraw__comm(req)); - -#if SIMGRID_HAVE_MC - s_xbt_dynar_t comms_buffer; - size_t buffer_size = 0; - if (mc_model_checker != nullptr) { - // Read dynar: - mc_model_checker->process().read(&comms_buffer, remote(simcall_comm_waitany__get__comms(req))); - assert(comms_buffer.elmsize == sizeof(act)); - buffer_size = comms_buffer.elmsize * comms_buffer.used; - comms = &comms_buffer; - } else - comms = simcall_comm_waitany__get__comms(req); - - // Read all the dynar buffer: - char buffer[buffer_size]; - if (mc_model_checker != nullptr) - mc_model_checker->process().read_bytes(buffer, sizeof(buffer), remote(comms->data)); -#else - comms = simcall_comm_waitany__get__comms(req); -#endif - + xbt_dynar_t comms = simcall_comm_waitany__get__comms(req); for (unsigned int index = 0; index < comms->used; ++index) { -#if SIMGRID_HAVE_MC - // Fetch act from MCed memory: - // 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_comm, remote(act)); - act = static_cast(temp_comm.getBuffer()); - } else -#endif - act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*); + simgrid::kernel::activity::CommImpl* act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*); if (act->src_proc && act->dst_proc) return true; } @@ -149,26 +108,10 @@ bool actor_is_enabled(smx_actor_t actor) case SIMCALL_MUTEX_LOCK: { smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); -#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; -#if SIMGRID_HAVE_MC - else if (mc_model_checker != nullptr) { - simgrid::mc::RemoteClient& modelchecked = mc_model_checker->process(); - // TODO, *(mutex->owner) :/ - 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; + return mutex->owner->pid == req->issuer->pid; } case SIMCALL_SEM_ACQUIRE: { @@ -193,18 +136,19 @@ 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) { - 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 - ; +#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; } } @@ -231,7 +175,7 @@ static int prng_random(int min, int max) int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max) { - if (not MC_is_active() && not MC_record_path) + if (not MC_is_active() && MC_record_path.empty()) return prng_random(min, max); return simcall->mc_value; }