From ceaf8b82812aa8d58495687482fc6d4995119934 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 17 Jul 2017 00:49:57 +0200 Subject: [PATCH] remove one layer of calls --- src/mc/mc_base.cpp | 139 ------------------------------------------ src/mc/mc_base.h | 9 --- src/mc/mc_record.cpp | 6 +- src/mc/mc_request.cpp | 138 ++++++++++++++++++++++++++++++++++++++++- src/mc/mc_request.h | 5 ++ 5 files changed, 143 insertions(+), 154 deletions(-) diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 067a29f63f..384501de4d 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -56,145 +56,6 @@ void wait_for_requests() #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) -{ - // 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 */ - 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. */ - if (_sg_mc_timeout == 1) - return true; - } - /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ - 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::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 - - 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*); - if (act->src_proc && act->dst_proc) - return true; - } - return false; - } - - 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; - } - - 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; - } -} bool request_is_visible(smx_simcall_t req) { diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h index 1f94f1b94b..ed2458d020 100644 --- a/src/mc/mc_base.h +++ b/src/mc/mc_base.h @@ -15,15 +15,6 @@ namespace simgrid { namespace mc { -/** Can this requests can be executed? - * - * Most requests are always enabled but WAIT and WAITANY - * are not always enabled: a WAIT where the communication does not - * have both a source and a destination yet is not enabled - * (unless timeout is enabled in the wait and enabeld in SimGridMC). - */ -XBT_PRIVATE bool request_is_enabled(smx_simcall_t req); - /** Execute everything which is invisible * * Execute all the processes that are ready to run and all invisible simcalls diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index 62a4fa852b..ce2bfa2cba 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -54,11 +54,11 @@ void replay(RecordTrace const& trace) // Choose a request: smx_actor_t process = SIMIX_process_from_PID(transition.pid); if (not process) - xbt_die("Unexpected process."); + xbt_die("Unexpected process (pid:%d).", transition.pid); smx_simcall_t simcall = &(process->simcall); if (not simcall || simcall->call == SIMCALL_NONE) - xbt_die("No simcall for this process."); - if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::request_is_enabled(simcall)) + xbt_die("No simcall for process %d.", transition.pid); + if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::actor_is_enabled(process)) xbt_die("Unexpected simcall."); // Execute the request: diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index efa8aa7dd0..4c8b4f5b7a 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -1,11 +1,11 @@ -/* 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 "src/include/mc/mc.h" #include "src/mc/ModelChecker.hpp" #include "src/mc/mc_request.h" #include "src/mc/mc_smx.h" @@ -432,9 +432,141 @@ bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx) return comm->src_proc && comm->dst_proc; } +/** @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 actor_is_enabled(smx_actor_t actor) { - return simgrid::mc::request_is_enabled(&actor->simcall); + smx_simcall_t req = &actor->simcall; + // 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 */ + 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. */ + if (_sg_mc_timeout == 1) + return true; + } + /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ + 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::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 + + 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*); + if (act->src_proc && act->dst_proc) + return true; + } + return false; + } + + 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; + } + + 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; + } } static const char* colors[] = { diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h index 2672208d1c..2d78269da1 100644 --- a/src/mc/mc_request.h +++ b/src/mc/mc_request.h @@ -26,6 +26,11 @@ XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx); /** Is the process ready to execute its simcall? * * This is true if the request associated with the process is ready. + * + * Most requests are always enabled but WAIT and WAITANY + * are not always enabled: a WAIT where the communication does not + * have both a source and a destination yet is not enabled + * (unless timeout is enabled in the wait and enabeld in SimGridMC). */ XBT_PRIVATE bool actor_is_enabled(smx_actor_t process); -- 2.20.1