X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d67913389a462ad30f7ab68f466209e9962b52af..6372a504431294a747f1513c8611912504a7cb39:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 0725417de0..b178888c2b 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -3,54 +3,34 @@ /* 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 SIMGRID_HAVE_MC -#include "src/mc/mc_request.h" -#include "src/mc/Process.hpp" #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_smx.h" 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 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 SIMGRID_HAVE_MC xbt_assert(mc_model_checker == nullptr); @@ -60,11 +40,11 @@ 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); } } @@ -89,7 +69,6 @@ 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) { @@ -99,16 +78,16 @@ bool request_is_enabled(smx_simcall_t req) 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 SIMGRID_HAVE_MC // Fetch from MCed memory: // HACK, type puning if (mc_model_checker != nullptr) { - simgrid::mc::Remote temp_comm; + 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 @@ -127,8 +106,8 @@ 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)); + simgrid::kernel::activity::CommImpl* act = + static_cast(&*simcall_comm_wait__get__comm(req)); #if SIMGRID_HAVE_MC s_xbt_dynar_t comms_buffer; @@ -152,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) { + 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; } @@ -174,7 +153,7 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_MUTEX_LOCK: { smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); #if SIMGRID_HAVE_MC - simgrid::mc::Remote temp_mutex; + simgrid::mc::Remote temp_mutex; if (mc_model_checker != nullptr) { mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex)); mutex = temp_mutex.getBuffer(); @@ -197,7 +176,7 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_SEM_ACQUIRE: { static int warned = 0; - if (!warned) + if (not warned) XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk"); warned = 1; return true; @@ -205,7 +184,7 @@ bool request_is_enabled(smx_simcall_t req) case SIMCALL_COND_WAIT: { static int warned = 0; - if (!warned) + if (not warned) XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk"); warned = 1; return true; @@ -255,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; }