X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce2e676ad127f782b9c959499ab1c042195e411a..67592b097ee1e3d2bc4c1e79d8401732d8d6f869:/src/mc/mc_state.cpp diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 35fc6781d5..a6f51d354b 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -6,6 +6,8 @@ #include +#include + #include #include @@ -28,12 +30,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, simgrid::mc::State* MC_state_new() { simgrid::mc::State* state = new simgrid::mc::State(); - std::memset(&state->internal_comm, 0, sizeof(state->internal_comm)); - std::memset(&state->internal_req, 0, sizeof(state->internal_req)); - std::memset(&state->executed_req, 0, sizeof(state->executed_req)); - - state->max_pid = MC_smx_get_maxpid(); - state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid); + state->processStates.resize(MC_smx_get_maxpid()); state->num = ++mc_stats->expanded_states; /* Stateful model checking */ if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) || _sg_mc_termination){ @@ -56,161 +53,41 @@ State::State() std::memset(&this->executed_req, 0, sizeof(this->executed_req)); } -State::~State() -{ - xbt_free(this->index_comm); - xbt_free(this->incomplete_comm_pattern); - xbt_free(this->proc_status); -} - -} -} - -/** - * \brief Deletes a state data structure - * \param trans The state to be deleted - */ -void MC_state_delete(simgrid::mc::State* state, int free_snapshot) -{ - delete state; -} - -void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process) +std::size_t State::interleaveSize() const { - assert(state); - state->proc_status[process->pid].state = MC_INTERLEAVE; - state->proc_status[process->pid].interleave_count = 0; + return std::count_if(this->processStates.begin(), this->processStates.end(), + [](simgrid::mc::ProcessState const& state) { return state.isToInterleave(); }); } -void MC_state_remove_interleave_process(simgrid::mc::State* state, smx_process_t process) +RecordTraceElement State::getRecordElement() const { - if (state->proc_status[process->pid].state == MC_INTERLEAVE) - state->proc_status[process->pid].state = MC_DONE; -} - -unsigned int MC_state_interleave_size(simgrid::mc::State* state) -{ - unsigned int i, size = 0; - for (i = 0; i < state->max_pid; i++) - if ((state->proc_status[i].state == MC_INTERLEAVE) - || (state->proc_status[i].state == MC_MORE_INTERLEAVE)) - size++; - return size; -} - -int MC_state_process_is_done(simgrid::mc::State* state, smx_process_t process) -{ - return state->proc_status[process->pid].state == MC_DONE ? TRUE : FALSE; -} - -void MC_state_set_executed_request(simgrid::mc::State* state, smx_simcall_t req, - int value) -{ - 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 the dependence - * function. */ - switch (req->call) { - case SIMCALL_COMM_WAITANY: { - state->internal_req.call = SIMCALL_COMM_WAIT; - state->internal_req.issuer = req->issuer; - 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); - simcall_comm_wait__set__timeout(&state->internal_req, 0); - break; - } - - case SIMCALL_COMM_TESTANY: - 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)); - } - - simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); - simcall_comm_test__set__result(&state->internal_req, value); - 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); - 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); - break; - - case SIMCALL_MC_RANDOM: { - state->internal_req = *req; - int random_max = simcall_mc_random__get__max(req); - if (value != random_max) - for (auto& p : mc_model_checker->process().simix_processes()) { - mc_procstate_t procstate = &state->proc_status[p.copy.pid]; - const smx_process_t issuer = MC_smx_simcall_get_issuer(req); - if (p.copy.pid == issuer->pid) { - procstate->state = MC_MORE_INTERLEAVE; - break; - } - } - break; - } - - default: - state->internal_req = *req; - break; - } + smx_process_t issuer = MC_smx_simcall_get_issuer(&this->executed_req); + return RecordTraceElement(issuer->pid, this->req_num); } -smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value) -{ - *value = state->req_num; - return &state->executed_req; } - -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) { - mc_procstate_t procstate = &state->proc_status[process->pid]; + simgrid::mc::ProcessState* procstate = &state->processStates[process->pid]; - if (procstate->state != MC_INTERLEAVE - && procstate->state != MC_MORE_INTERLEAVE) - return nullptr; + if (!procstate->isToInterleave()) + return nullptr; if (!simgrid::mc::process_is_enabled(process)) return nullptr; + smx_simcall_t req = nullptr; switch (process->simcall.call) { - case SIMCALL_COMM_WAITANY: - *value = -1; + state->req_num = -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->req_num = procstate->interleave_count - 1; break; } } @@ -218,32 +95,30 @@ static inline smx_simcall_t MC_state_get_request_for_process( if (procstate->interleave_count >= simgrid::mc::read_length(mc_model_checker->process(), simgrid::mc::remote(simcall_comm_waitany__get__comms(&process->simcall)))) - procstate->state = MC_DONE; - - if (*value != -1) - return &process->simcall; - + procstate->setDone(); + if (state->req_num != -1) + req = &process->simcall; break; case SIMCALL_COMM_TESTANY: { unsigned start_count = procstate->interleave_count; - *value = -1; + state->req_num = -1; while (procstate->interleave_count < read_length(mc_model_checker->process(), remote(simcall_comm_testany__get__comms(&process->simcall)))) if (simgrid::mc::request_is_enabled_by_idx(&process->simcall, procstate->interleave_count++)) { - *value = procstate->interleave_count - 1; + state->req_num = procstate->interleave_count - 1; break; } if (procstate->interleave_count >= read_length(mc_model_checker->process(), remote(simcall_comm_testany__get__comms(&process->simcall)))) - procstate->state = MC_DONE; + procstate->setDone(); - if (*value != -1 || start_count == 0) - return &process->simcall; + if (state->req_num != -1 || start_count == 0) + req = &process->simcall; break; } @@ -254,36 +129,101 @@ static inline smx_simcall_t MC_state_get_request_for_process( mc_model_checker->process().read_bytes( &act, sizeof(act), remote(remote_act)); if (act.comm.src_proc && act.comm.dst_proc) - *value = 0; + state->req_num = 0; else if (act.comm.src_proc == nullptr && act.comm.type == SIMIX_COMM_READY && act.comm.detached == 1) - *value = 0; + state->req_num = 0; else - *value = -1; - procstate->state = MC_DONE; - return &process->simcall; + state->req_num = -1; + procstate->setDone(); + req = &process->simcall; + break; } - case SIMCALL_MC_RANDOM: - if (procstate->state == MC_INTERLEAVE) - *value = simcall_mc_random__get__min(&process->simcall); - else if (state->req_num < simcall_mc_random__get__max(&process->simcall)) - *value = state->req_num + 1; - procstate->state = MC_DONE; - return &process->simcall; + case SIMCALL_MC_RANDOM: { + int min_value = simcall_mc_random__get__min(&process->simcall); + state->req_num = procstate->interleave_count + min_value; + procstate->interleave_count++; + if (state->req_num == simcall_mc_random__get__max(&process->simcall)) + procstate->setDone(); + req = &process->simcall; + break; + } default: - procstate->state = MC_DONE; - *value = 0; - return &process->simcall; + procstate->setDone(); + state->req_num = 0; + req = &process->simcall; + break; } - return nullptr; + if (!req) + return nullptr; + + // Fetch the data of the request and translate it: + + state->executed_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.issuer = req->issuer; + smx_synchro_t remote_comm; + read_element(mc_model_checker->process(), + &remote_comm, remote(simcall_comm_waitany__get__comms(req)), + state->req_num, 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); + simcall_comm_wait__set__timeout(&state->internal_req, 0); + break; + } + + case SIMCALL_COMM_TESTANY: + state->internal_req.call = SIMCALL_COMM_TEST; + state->internal_req.issuer = req->issuer; + + if (state->req_num > 0) { + smx_synchro_t remote_comm; + read_element(mc_model_checker->process(), + &remote_comm, remote(simcall_comm_testany__get__comms(req)), + state->req_num, sizeof(remote_comm)); + mc_model_checker->process().read(&state->internal_comm, remote(remote_comm)); + } + + simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm); + simcall_comm_test__set__result(&state->internal_req, state->req_num); + 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); + 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); + break; + + default: + state->internal_req = *req; + break; + } + + 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); if (res) return res; }