X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d36e9a7ac2032c4fddcb236753b99c6573129893..4326c258372488ae763695bc79b0529ab96cc20d:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 88254304b8..6f5e47b9ee 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2020. 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. */ @@ -13,21 +13,17 @@ using simgrid::mc::remote; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)"); - namespace simgrid { namespace mc { State::State(unsigned long state_number) : num_(state_number) { - this->internal_comm.clear(); - std::memset(&this->internal_req, 0, sizeof(this->internal_req)); - std::memset(&this->executed_req_, 0, sizeof(this->executed_req_)); + this->internal_comm_.clear(); actor_states_.resize(MC_smx_get_maxpid()); /* Stateful model checking */ if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) { - system_state = std::make_shared(num_); + system_state_ = std::make_shared(num_); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { MC_state_copy_incomplete_communications_pattern(this); MC_state_copy_index_communications_pattern(this); @@ -60,7 +56,7 @@ Transition State::get_transition() const * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT * (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition. */ -static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor) +static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::State* state, smx_actor_t actor) { /* reset the outgoing transition */ simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()]; @@ -116,7 +112,7 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* remote(static_cast(simcall_comm_wait__getraw__comm(&actor->simcall))); simgrid::mc::Remote temp_act; mc_model_checker->process().read(temp_act, remote_act); - simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer(); + const simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer(); if (act->src_actor_.get() && act->dst_actor_.get()) state->transition_.argument_ = 0; // OK else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY && @@ -151,47 +147,47 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state->transition_.pid_ = actor->get_pid(); state->executed_req_ = *req; // Fetch the data of the request and translate it: - state->internal_req = *req; + state->internal_req_ = *req; /* 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 the dependence function. */ switch (req->call_) { case SIMCALL_COMM_WAITANY: { - state->internal_req.call_ = SIMCALL_COMM_WAIT; + state->internal_req_.call_ = SIMCALL_COMM_WAIT; simgrid::kernel::activity::CommImpl* remote_comm; remote_comm = mc_model_checker->process().read( remote(simcall_comm_waitany__get__comms(req) + state->transition_.argument_)); - mc_model_checker->process().read(state->internal_comm, remote(remote_comm)); - simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.get_buffer()); - simcall_comm_wait__set__timeout(&state->internal_req, 0); + mc_model_checker->process().read(state->internal_comm_, remote(remote_comm)); + simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); + simcall_comm_wait__set__timeout(&state->internal_req_, 0); break; } case SIMCALL_COMM_TESTANY: - state->internal_req.call_ = SIMCALL_COMM_TEST; + state->internal_req_.call_ = SIMCALL_COMM_TEST; if (state->transition_.argument_ > 0) { simgrid::kernel::activity::CommImpl* 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(remote_comm)); + mc_model_checker->process().read(state->internal_comm_, remote(remote_comm)); } - simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.get_buffer()); - simcall_comm_test__set__result(&state->internal_req, state->transition_.argument_); + simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); + simcall_comm_test__set__result(&state->internal_req_, state->transition_.argument_); break; case SIMCALL_COMM_WAIT: - mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm), + mc_model_checker->process().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_), remote(simcall_comm_wait__getraw__comm(req))); - simcall_comm_wait__set__comm(&state->executed_req_, state->internal_comm.get_buffer()); - simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.get_buffer()); + simcall_comm_wait__set__comm(&state->executed_req_, state->internal_comm_.get_buffer()); + simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); break; case SIMCALL_COMM_TEST: - mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm), + mc_model_checker->process().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_), remote(simcall_comm_test__getraw__comm(req))); - simcall_comm_test__set__comm(&state->executed_req_, state->internal_comm.get_buffer()); - simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.get_buffer()); + simcall_comm_test__set__comm(&state->executed_req_, state->internal_comm_.get_buffer()); + simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); break; default: @@ -202,14 +198,14 @@ static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* return req; } -smx_simcall_t MC_state_get_request(simgrid::mc::State* state) +smx_simcall_t MC_state_choose_request(simgrid::mc::State* state) { for (auto& actor : mc_model_checker->process().actors()) { /* Only consider the actors that were marked as interleaving by the checker algorithm */ if (not state->actor_states_[actor.copy.get_buffer()->get_pid()].is_todo()) continue; - smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.get_buffer()); + smx_simcall_t res = MC_state_choose_request_for_process(state, actor.copy.get_buffer()); if (res) return res; }