X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b356352e87ae00a20f737c48e19b0c8413455a..909864a6927db2f6105ab740ad185de7aa7e5a71:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 8c8610fe80..42906fe22b 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -4,30 +4,33 @@ /* 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 -#include "mc_base.h" -#include "../simix/smx_private.h" -#include "mc/mc_record.h" -#include "mc/mc_replay.h" +#include "src/mc/mc_base.h" +#include "src/simix/smx_private.h" +#include "src/mc/mc_replay.h" #include "mc/mc.h" -#include "mc_protocol.h" +#include "src/mc/mc_protocol.h" -#ifdef HAVE_MC -#include "mc_process.h" -#include "ModelChecker.hpp" -#include "mc_smx.h" -#include "mc_server.h" +#if HAVE_MC +#include "src/mc/mc_request.h" +#include "src/mc/Process.hpp" +#include "src/mc/ModelChecker.hpp" +#include "src/mc/mc_smx.h" #endif -#ifdef HAVE_MC +#if HAVE_MC using simgrid::mc::remote; #endif -extern "C" { - XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); int MC_random(int min, int max) @@ -35,18 +38,15 @@ int MC_random(int min, int max) xbt_assert(mc_mode != MC_MODE_SERVER); /* TODO, if the MC is disabled we do not really need to make a simcall for * this :) */ - /* FIXME: return mc_current_state->executed_transition->random.value; */ return simcall_mc_random(min, max); } -void MC_wait_for_requests(void) +namespace simgrid { +namespace mc { + +void wait_for_requests(void) { -#ifdef HAVE_MC - if (mc_mode == MC_MODE_SERVER) { - MC_server_wait_client(&mc_model_checker->process()); - return; - } -#endif + assert(mc_mode != MC_MODE_SERVER); smx_process_t process; smx_simcall_t req; @@ -56,30 +56,30 @@ void MC_wait_for_requests(void) SIMIX_process_runall(); xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { req = &process->simcall; - if (req->call != SIMCALL_NONE && !MC_request_is_visible(req)) + if (req->call != SIMCALL_NONE && !simgrid::mc::request_is_visible(req)) SIMIX_simcall_handle(req, 0); } } } // Called from both MCer and MCed: -int MC_request_is_enabled(smx_simcall_t req) +bool request_is_enabled(smx_simcall_t req) { unsigned int index = 0; smx_synchro_t act = 0; -#ifdef HAVE_MC +#if HAVE_MC s_smx_synchro_t temp_synchro; #endif switch (req->call) { case SIMCALL_NONE: - return FALSE; + return false; case SIMCALL_COMM_WAIT: /* FIXME: check also that src and dst processes are not suspended */ act = simcall_comm_wait__get__comm(req); -#ifdef HAVE_MC +#if HAVE_MC // Fetch from MCed memory: if (mc_mode == MC_MODE_SERVER) { mc_model_checker->process().read(&temp_synchro, remote(act)); @@ -91,18 +91,17 @@ int MC_request_is_enabled(smx_simcall_t req) /* 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 (_sg_mc_timeout == 1) - return TRUE; - } else { - /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ - if (act->comm.detached && act->comm.src_proc == NULL - && act->comm.type == SIMIX_COMM_READY) - return (act->comm.dst_proc != NULL); + return true; } + /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ + else if (act->comm.detached && act->comm.src_proc == nullptr + && act->comm.type == SIMIX_COMM_READY) + return (act->comm.dst_proc != nullptr); return (act->comm.src_proc && act->comm.dst_proc); case SIMCALL_COMM_WAITANY: { xbt_dynar_t comms; -#ifdef HAVE_MC +#if HAVE_MC s_xbt_dynar_t comms_buffer; size_t buffer_size = 0; @@ -113,9 +112,9 @@ int MC_request_is_enabled(smx_simcall_t req) assert(comms_buffer.elmsize == sizeof(act)); buffer_size = comms_buffer.elmsize * comms_buffer.used; comms = &comms_buffer; - } else { + } else comms = simcall_comm_waitany__get__comms(req); - } + // Read all the dynar buffer: char buffer[buffer_size]; if (mc_mode == MC_MODE_SERVER) @@ -126,7 +125,7 @@ int MC_request_is_enabled(smx_simcall_t req) #endif for (index = 0; index < comms->used; ++index) { -#ifdef HAVE_MC +#if HAVE_MC // Fetch act from MCed memory: if (mc_mode == MC_MODE_SERVER) { memcpy(&act, buffer + comms->elmsize * index, sizeof(act)); @@ -137,39 +136,45 @@ int MC_request_is_enabled(smx_simcall_t req) #endif act = xbt_dynar_get_as(comms, index, smx_synchro_t); if (act->comm.src_proc && act->comm.dst_proc) - return TRUE; + return true; } - return FALSE; + return false; } + case SIMCALL_MUTEX_TRYLOCK: + return true; + case SIMCALL_MUTEX_LOCK: { smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); -#ifdef HAVE_MC +#if HAVE_MC s_smx_mutex_t temp_mutex; if (mc_mode == MC_MODE_SERVER) { mc_model_checker->process().read(&temp_mutex, remote(mutex)); mutex = &temp_mutex; } #endif - if(mutex->owner == NULL) - return TRUE; - else -#ifdef HAVE_MC + + if(mutex->owner == nullptr) + return true; +#if HAVE_MC + else if (mc_mode == MC_MODE_SERVER) { + simgrid::mc::Process& modelchecked = mc_model_checker->process(); // TODO, *(mutex->owner) :/ - return MC_smx_resolve_process(mutex->owner)->pid == - MC_smx_resolve_process(req->issuer)->pid; -#else - return mutex->owner->pid == req->issuer->pid; + return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid + == modelchecked.resolveProcess(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; + return true; } } -int MC_request_is_visible(smx_simcall_t req) +bool request_is_visible(smx_simcall_t req) { return req->call == SIMCALL_COMM_ISEND || req->call == SIMCALL_COMM_IRECV @@ -179,13 +184,13 @@ int MC_request_is_visible(smx_simcall_t req) || req->call == SIMCALL_COMM_TESTANY || req->call == SIMCALL_MC_RANDOM || req->call == SIMCALL_MUTEX_LOCK -#ifdef HAVE_MC - || req->call == SIMCALL_MC_SNAPSHOT - || req->call == SIMCALL_MC_COMPARE_SNAPSHOTS -#endif + || req->call == SIMCALL_MUTEX_TRYLOCK ; } +} +} + static int prng_random(int min, int max) { unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1; @@ -196,7 +201,7 @@ static int prng_random(int min, int max) // Use rejection in order to avoid skew unsigned long x; do { -#ifndef _XBT_WIN32 +#ifndef _WIN32 x = (unsigned long) random(); #else x = (unsigned long) rand(); @@ -207,35 +212,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 (!MC_is_active() && !MC_record_path) return prng_random(min, max); - } - return simcall->mc_value; } - -void MC_simcall_handle(smx_simcall_t req, int value) -{ -#ifndef HAVE_MC - SIMIX_simcall_handle(req, value); -#else - if (mc_mode == MC_MODE_CLIENT) { - SIMIX_simcall_handle(req, value); - return; - } - - unsigned i; - mc_smx_process_info_t pi = NULL; - - xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) { - if (req == &pi->copy.simcall) { - MC_server_simcall_handle(&mc_model_checker->process(), pi->copy.pid, value); - return; - } - } - - xbt_die("Could not find the request"); -#endif -} - -}