X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2bdd4ab1f667695dbf8aeedfe7d3d940991146cd..b51da37243dc16575499f4cb7729fe8bdd7fa514:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 1a88fb1abb..59a9de060f 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -6,7 +6,7 @@ #include -#include +#include #include #include @@ -18,6 +18,7 @@ #include "src/mc/mc_comm_pattern.h" #include "src/mc/mc_smx.h" #include "src/mc/mc_xbt.hpp" +#include "src/mc/Transition.hpp" using simgrid::mc::remote; @@ -27,13 +28,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, /** * \brief Creates a state data structure used by the exploration algorithm */ -simgrid::mc::State* MC_state_new() +simgrid::mc::State* MC_state_new(unsigned long state_number) { simgrid::mc::State* state = new simgrid::mc::State(); state->processStates.resize(MC_smx_get_maxpid()); - state->num = ++mc_stats->expanded_states; + state->num = state_number; /* Stateful model checking */ - if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){ + if((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination){ state->system_state = simgrid::mc::take_snapshot(state->num); if(_sg_mc_comms_determinism || _sg_mc_send_determinism){ MC_state_copy_incomplete_communications_pattern(state); @@ -48,35 +49,31 @@ namespace mc { State::State() { - std::memset(&this->internal_comm, 0, sizeof(this->internal_comm)); + this->internal_comm.clear(); std::memset(&this->internal_req, 0, sizeof(this->internal_req)); std::memset(&this->executed_req, 0, sizeof(this->executed_req)); } std::size_t State::interleaveSize() const { - return std::count_if(this->processStates.begin(), this->processStates.end(), - [](simgrid::mc::ProcessState const& state) { return state.isToInterleave(); }); + return boost::range::count_if(this->processStates, + [](simgrid::mc::ProcessState const& p) { return p.isToInterleave(); }); } -} -} - -smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value) +Transition State::getTransition() const { - *value = state->req_num; - return &state->executed_req; + return this->transition; } -smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state) -{ - return &state->internal_req; +} } static inline smx_simcall_t MC_state_get_request_for_process( - simgrid::mc::State* state, int*value, smx_process_t process) + simgrid::mc::State* state, smx_process_t process) { simgrid::mc::ProcessState* procstate = &state->processStates[process->pid]; + state->transition.pid = -1; + state->transition.argument = -1; if (!procstate->isToInterleave()) return nullptr; @@ -86,13 +83,13 @@ static inline smx_simcall_t MC_state_get_request_for_process( smx_simcall_t req = nullptr; switch (process->simcall.call) { case SIMCALL_COMM_WAITANY: - *value = -1; + state->transition.argument = -1; while (procstate->interleave_count < read_length(mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(&process->simcall)))) { if (simgrid::mc::request_is_enabled_by_idx(&process->simcall, procstate->interleave_count++)) { - *value = procstate->interleave_count - 1; + state->transition.argument = procstate->interleave_count - 1; break; } } @@ -101,45 +98,44 @@ static inline smx_simcall_t MC_state_get_request_for_process( simgrid::mc::read_length(mc_model_checker->process(), simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall)))) procstate->setDone(); - if (*value != -1) + if (state->transition.argument != -1) req = &process->simcall; break; case SIMCALL_COMM_TESTANY: { unsigned start_count = procstate->interleave_count; - *value = -1; + state->transition.argument = -1; while (procstate->interleave_count < - read_length(mc_model_checker->process(), - remote(simcall_comm_testany__get__comms(&process->simcall)))) + simcall_comm_testany__get__count(&process->simcall)) if (simgrid::mc::request_is_enabled_by_idx(&process->simcall, procstate->interleave_count++)) { - *value = procstate->interleave_count - 1; + state->transition.argument = procstate->interleave_count - 1; break; } if (procstate->interleave_count >= - read_length(mc_model_checker->process(), - remote(simcall_comm_testany__get__comms(&process->simcall)))) + simcall_comm_testany__get__count(&process->simcall)) procstate->setDone(); - if (*value != -1 || start_count == 0) + if (state->transition.argument != -1 || start_count == 0) req = &process->simcall; break; } case SIMCALL_COMM_WAIT: { - smx_synchro_t remote_act = simcall_comm_wait__get__comm(&process->simcall); - s_smx_synchro_t act; - mc_model_checker->process().read_bytes( - &act, sizeof(act), remote(remote_act)); - if (act.comm.src_proc && act.comm.dst_proc) - *value = 0; - else if (act.comm.src_proc == nullptr && act.comm.type == SIMIX_COMM_READY - && act.comm.detached == 1) - *value = 0; + simgrid::mc::RemotePtr remote_act = remote( + static_cast(simcall_comm_wait__get__comm(&process->simcall))); + simgrid::mc::Remote temp_act; + mc_model_checker->process().read(temp_act, remote_act); + simgrid::simix::Comm* act = temp_act.getBuffer(); + if (act->src_proc && act->dst_proc) + state->transition.argument = 0; + else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY + && act->detached == 1) + state->transition.argument = 0; else - *value = -1; + state->transition.argument = -1; procstate->setDone(); req = &process->simcall; break; @@ -147,9 +143,9 @@ static inline smx_simcall_t MC_state_get_request_for_process( case SIMCALL_MC_RANDOM: { int min_value = simcall_mc_random__get__min(&process->simcall); - *value = procstate->interleave_count + min_value; + state->transition.argument = procstate->interleave_count + min_value; procstate->interleave_count++; - if (*value == simcall_mc_random__get__max(&process->simcall)) + if (state->transition.argument == simcall_mc_random__get__max(&process->simcall)) procstate->setDone(); req = &process->simcall; break; @@ -157,7 +153,7 @@ static inline smx_simcall_t MC_state_get_request_for_process( default: procstate->setDone(); - *value = 0; + state->transition.argument = 0; req = &process->simcall; break; } @@ -166,8 +162,9 @@ static inline smx_simcall_t MC_state_get_request_for_process( // Fetch the data of the request and translate it: + state->transition.pid = process->pid; + state->executed_req = *req; - state->req_num = *value; /* The waitany and testany request are transformed into a wait or test request * over the corresponding communication action so it can be treated later by @@ -179,9 +176,10 @@ static inline smx_simcall_t MC_state_get_request_for_process( smx_synchro_t remote_comm; read_element(mc_model_checker->process(), &remote_comm, remote(simcall_comm_waitany__get__comms(req)), - *value, sizeof(remote_comm)); - mc_model_checker->process().read(&state->internal_comm, remote(remote_comm)); - simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm); + state->transition.argument, sizeof(remote_comm)); + mc_model_checker->process().read(state->internal_comm, remote( + static_cast(remote_comm))); + simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer()); simcall_comm_wait__set__timeout(&state->internal_req, 0); break; } @@ -190,32 +188,31 @@ static inline smx_simcall_t MC_state_get_request_for_process( state->internal_req.call = SIMCALL_COMM_TEST; state->internal_req.issuer = req->issuer; - if (*value > 0) { - smx_synchro_t remote_comm; - read_element(mc_model_checker->process(), - &remote_comm, remote(simcall_comm_testany__get__comms(req)), - *value, sizeof(remote_comm)); - mc_model_checker->process().read(&state->internal_comm, remote(remote_comm)); + if (state->transition.argument > 0) { + smx_synchro_t remote_comm = mc_model_checker->process().read( + remote(simcall_comm_testany__get__comms(req) + state->transition.argument)); + mc_model_checker->process().read(state->internal_comm, remote( + static_cast(remote_comm))); } - simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); - simcall_comm_test__set__result(&state->internal_req, *value); + simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer()); + simcall_comm_test__set__result(&state->internal_req, state->transition.argument); break; case SIMCALL_COMM_WAIT: state->internal_req = *req; mc_model_checker->process().read_bytes(&state->internal_comm , sizeof(state->internal_comm), remote(simcall_comm_wait__get__comm(req))); - simcall_comm_wait__set__comm(&state->executed_req, &state->internal_comm); - simcall_comm_wait__set__comm(&state->internal_req, &state->internal_comm); + simcall_comm_wait__set__comm(&state->executed_req, state->internal_comm.getBuffer()); + simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer()); break; case SIMCALL_COMM_TEST: state->internal_req = *req; mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm), remote(simcall_comm_test__get__comm(req))); - simcall_comm_test__set__comm(&state->executed_req, &state->internal_comm); - simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); + simcall_comm_test__set__comm(&state->executed_req, state->internal_comm.getBuffer()); + simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer()); break; default: @@ -226,10 +223,10 @@ static inline smx_simcall_t MC_state_get_request_for_process( return req; } -smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value) +smx_simcall_t MC_state_get_request(simgrid::mc::State* state) { for (auto& p : mc_model_checker->process().simix_processes()) { - smx_simcall_t res = MC_state_get_request_for_process(state, value, &p.copy); + smx_simcall_t res = MC_state_get_request_for_process(state, p.copy.getBuffer()); if (res) return res; }