X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbef7c255d1e1bebb88d6986817557648289aec8..22cae46149e1fb4988ad9e46060c3e7ecd4e0e44:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 96fee34cff..4bc39eb2a2 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,61 +1,38 @@ -/* 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/mc/mc_replay.h" -#include "src/mc/remote/mc_protocol.h" #include "src/simix/smx_private.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" +#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 @@ -63,17 +40,17 @@ void wait_for_requests(void) 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 HAVE_MC +#if SIMGRID_HAVE_MC xbt_dynar_reset(simix_global->actors_vector); - for (std::pair kv : simix_global->process_list) { + for (std::pair kv : simix_global->process_list) { xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second); } #endif @@ -99,22 +76,17 @@ bool request_is_enabled(smx_simcall_t req) 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)); -#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()); } @@ -137,8 +109,8 @@ bool request_is_enabled(smx_simcall_t req) xbt_dynar_t comms; simgrid::kernel::activity::Comm *act = static_cast(simcall_comm_wait__get__comm(req)); -#if HAVE_MC +#if SIMGRID_HAVE_MC s_xbt_dynar_t comms_buffer; size_t buffer_size = 0; if (mc_model_checker != nullptr) { @@ -161,7 +133,7 @@ bool request_is_enabled(smx_simcall_t req) #endif for (index = 0; index < comms->used; ++index) { -#if HAVE_MC +#if SIMGRID_HAVE_MC // Fetch act from MCed memory: // HACK, type puning simgrid::mc::Remote temp_comm; @@ -181,8 +153,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(); @@ -191,7 +163,7 @@ 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) :/ @@ -203,9 +175,25 @@ bool request_is_enabled(smx_simcall_t req) 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; } } @@ -247,7 +235,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; }