-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2017. 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 <assert.h>
-#include <algorithm>
+#include <boost/range/algorithm.hpp>
#include <xbt/log.h>
#include <xbt/sysdep.h>
using simgrid::mc::remote;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc,
- "Logging specific to MC (state)");
-
-/**
- * \brief Creates a state data structure used by the exploration algorithm
- */
-simgrid::mc::State* MC_state_new()
-{
- simgrid::mc::State* state = new simgrid::mc::State();
- 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){
- 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);
- MC_state_copy_index_communications_pattern(state);
- }
- }
- return state;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)");
namespace simgrid {
namespace mc {
-State::State()
+State::State(unsigned long state_number)
{
- 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));
+
+ processStates.resize(MC_smx_get_maxpid());
+ num = state_number;
+ /* Stateful model checking */
+ if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
+ system_state = simgrid::mc::take_snapshot(num);
+ if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
+ MC_state_copy_incomplete_communications_pattern(this);
+ MC_state_copy_index_communications_pattern(this);
+ }
+ }
}
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(); });
}
Transition State::getTransition() const
}
static inline smx_simcall_t MC_state_get_request_for_process(
- simgrid::mc::State* state, smx_process_t process)
+ simgrid::mc::State* state, smx_actor_t process)
{
simgrid::mc::ProcessState* procstate = &state->processStates[process->pid];
state->transition.pid = -1;
if (!procstate->isToInterleave())
return nullptr;
- if (!simgrid::mc::process_is_enabled(process))
+ if (!simgrid::mc::actor_is_enabled(process))
return nullptr;
smx_simcall_t req = nullptr;
unsigned start_count = procstate->interleave_count;
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++)) {
state->transition.argument = procstate->interleave_count - 1;
}
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 (state->transition.argument != -1 || start_count == 0)
}
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)
+ simgrid::mc::RemotePtr<simgrid::kernel::activity::Comm> remote_act = remote(
+ static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(&process->simcall)));
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_act;
+ mc_model_checker->process().read(temp_act, remote_act);
+ simgrid::kernel::activity::Comm* act = temp_act.getBuffer();
+ if (act->src_proc && act->dst_proc)
state->transition.argument = 0;
- else if (act.comm.src_proc == nullptr && act.comm.type == SIMIX_COMM_READY
- && act.comm.detached == 1)
+ else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY
+ && act->detached == 1)
state->transition.argument = 0;
else
state->transition.argument = -1;
case SIMCALL_COMM_WAITANY: {
state->internal_req.call = SIMCALL_COMM_WAIT;
state->internal_req.issuer = req->issuer;
- smx_synchro_t remote_comm;
+ smx_activity_t remote_comm;
read_element(mc_model_checker->process(),
&remote_comm, remote(simcall_comm_waitany__get__comms(req)),
state->transition.argument, 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);
+ mc_model_checker->process().read(state->internal_comm, remote(
+ static_cast<simgrid::kernel::activity::Comm*>(remote_comm)));
+ simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.getBuffer());
simcall_comm_wait__set__timeout(&state->internal_req, 0);
break;
}
state->internal_req.issuer = req->issuer;
if (state->transition.argument > 0) {
- smx_synchro_t remote_comm;
- read_element(mc_model_checker->process(),
- &remote_comm, remote(simcall_comm_testany__get__comms(req)),
- state->transition.argument, sizeof(remote_comm));
- mc_model_checker->process().read(&state->internal_comm, remote(remote_comm));
+ smx_activity_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<simgrid::kernel::activity::Comm*>(remote_comm)));
}
- simcall_comm_test__set__comm(&state->internal_req, &state->internal_comm);
+ simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.getBuffer());
simcall_comm_test__set__result(&state->internal_req, state->transition.argument);
break;
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:
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, &p.copy);
+ for (auto& p : mc_model_checker->process().actors()) {
+ smx_simcall_t res = MC_state_get_request_for_process(state, p.copy.getBuffer());
if (res)
return res;
}
