X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31500e009164b73d7c26469db34e16cc119999f9..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 9d407ed069..70ca01cebf 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,25 +1,30 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. 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 -#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" +#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 @@ -30,27 +35,23 @@ extern "C" { XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); +} + int MC_random(int min, int max) { -#ifdef HAVE_MC 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); -#else - return min; -#endif } -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; @@ -60,14 +61,14 @@ 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; @@ -77,7 +78,7 @@ int MC_request_is_enabled(smx_simcall_t req) 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 */ @@ -95,13 +96,12 @@ 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: { @@ -117,9 +117,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) @@ -141,11 +141,14 @@ 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 @@ -155,8 +158,8 @@ int MC_request_is_enabled(smx_simcall_t req) mutex = &temp_mutex; } #endif - if(mutex->owner == NULL) - return TRUE; + if(mutex->owner == nullptr) + return true; else #ifdef HAVE_MC // TODO, *(mutex->owner) :/ @@ -169,11 +172,11 @@ int MC_request_is_enabled(smx_simcall_t req) 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 @@ -183,13 +186,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; @@ -200,7 +203,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(); @@ -211,14 +214,15 @@ 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) +namespace simgrid { +namespace mc { + +void handle_simcall(smx_simcall_t req, int value) { #ifndef HAVE_MC SIMIX_simcall_handle(req, value); @@ -228,18 +232,16 @@ void MC_simcall_handle(smx_simcall_t req, int 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); + for (auto& pi : mc_model_checker->process().smx_process_infos) + if (req == &pi.copy.simcall) { + mc_model_checker->simcall_handle( + mc_model_checker->process(), pi.copy.pid, value); return; } - } xbt_die("Could not find the request"); #endif } } +}