X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e6e8e102053ba7caf8a3663994bbc8a11047c60..bcb5cde966bef9e174da1c93cdb2158c0880a613:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index b82c3f2554..f367c99118 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,76 +1,59 @@ -/* 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/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/simix/smx_private.h" + +#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) { -#if HAVE_MC +#if SIMGRID_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 + /* TODO, if the MC is disabled we do not really need to make a simcall for this :) */ return simcall_mc_random(min, max); } namespace simgrid { namespace mc { -void wait_for_requests(void) +void wait_for_requests() { -#if HAVE_MC +#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; - while (!xbt_dynar_is_empty(simix_global->process_to_run)) { + while (not xbt_dynar_is_empty(simix_global->process_to_run)) { SIMIX_process_runall(); xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { req = &process->simcall; - if (req->call != SIMCALL_NONE && !simgrid::mc::request_is_visible(req)) + 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) { + 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 @@ -86,37 +69,31 @@ void wait_for_requests(void) // Called from both MCer and MCed: bool request_is_enabled(smx_simcall_t req) { - unsigned int index = 0; // 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 */ - simgrid::kernel::activity::Comm *act = - static_cast(simcall_comm_wait__get__comm(req)); + simgrid::kernel::activity::CommImpl* act = + static_cast(simcall_comm_wait__getraw__comm(req)); -#if HAVE_MC +#if SIMGRID_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.getBuffer()); + act = static_cast(temp_comm.getBuffer()); } #endif - if (simcall_comm_wait__get__timeout(req) >= 0) { - /* If it has a timeout it will be always be enabled, because even if the - * communication is not ready, it can timeout and won't block. */ + 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. */ if (_sg_mc_timeout == 1) return true; } @@ -129,10 +106,10 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_COMM_WAITANY: { xbt_dynar_t comms; - simgrid::kernel::activity::Comm *act = - static_cast(simcall_comm_wait__get__comm(req)); -#if HAVE_MC + 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) { @@ -154,19 +131,19 @@ bool request_is_enabled(smx_simcall_t req) comms = simcall_comm_waitany__get__comms(req); #endif - for (index = 0; index < comms->used; ++index) { -#if HAVE_MC + 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; + 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()); + act = static_cast(temp_comm.getBuffer()); } else #endif - act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::Comm*); + act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*); if (act->src_proc && act->dst_proc) return true; } @@ -175,8 +152,8 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_MUTEX_LOCK: { smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); -#if HAVE_MC - simgrid::mc::Remote 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(); @@ -185,21 +162,37 @@ bool request_is_enabled(smx_simcall_t req) if(mutex->owner == nullptr) return true; -#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 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 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 (not 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 (not 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; } } @@ -241,7 +234,7 @@ static int prng_random(int min, int max) int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max) { - if (!MC_is_active() && !MC_record_path) + if (not MC_is_active() && not MC_record_path) return prng_random(min, max); return simcall->mc_value; }