namespace simgrid {
namespace mc {
-State::State(unsigned long state_number) : num_(state_number)
+long State::expended_states_ = 0;
+
+State::State() : num_(++expended_states_)
{
const unsigned long maxpid = api::get().get_maxpid();
actor_states_.resize(maxpid);
+ transition_.reset(new Transition());
/* Stateful model checking */
- if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
+ if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
auto snapshot_ptr = api::get().take_snapshot(num_);
system_state_ = std::shared_ptr<simgrid::mc::Snapshot>(snapshot_ptr);
if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
Transition* State::get_transition() const
{
- return const_cast<Transition*>(&this->transition_);
+ return transition_.get();
}
int State::next_transition() const
}
return -1;
}
+Transition* State::execute_next(int next)
+{
+ std::vector<ActorInformation>& actors = mc_model_checker->get_remote_process().actors();
+
+ kernel::actor::ActorImpl* actor = actors[next].copy.get_buffer();
+ aid_t aid = actor->get_pid();
+ int times_considered;
+
+ simgrid::mc::ActorState* actor_state = &actor_states_[aid];
+ /* This actor is ready to be executed. Prepare its execution when simcall_handle will be called on it */
+ if (actor->simcall_.observer_ != nullptr) {
+ times_considered = actor_state->get_times_considered_and_inc();
+ if (actor->simcall_.mc_max_consider_ <= actor_state->get_times_considered())
+ actor_state->set_done();
+ } else {
+ times_considered = 0;
+ actor_state->set_done();
+ }
+
+ transition_->init(aid, times_considered);
+ executed_req_ = actor->simcall_;
+
+ XBT_DEBUG("Let's run actor %ld, going for transition %s", aid, transition_->to_cstring());
+
+ Transition::executed_transitions_++;
+
+ Transition* res = mc_model_checker->handle_simcall(*transition_, true);
+ mc_model_checker->wait_for_requests();
+
+ return res;
+}
void State::copy_incomplete_comm_pattern()
{