#include "src/mc/mc_record.h"
#include "src/mc/mc_replay.h"
#include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
#include "src/mc/mc_smx.h"
#include "src/mc/remote/Client.hpp"
namespace simgrid {
namespace mc {
-VisitedPair::VisitedPair(
- int pair_num, xbt_automaton_state_t automaton_state,
- std::shared_ptr<const std::vector<int>> atomic_propositions,
- std::shared_ptr<simgrid::mc::State> graph_state)
+VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state,
+ std::shared_ptr<const std::vector<int>> atomic_propositions,
+ std::shared_ptr<simgrid::mc::State> graph_state)
+ : num(pair_num), automaton_state(automaton_state)
{
- simgrid::mc::Process* process = &(mc_model_checker->process());
+ simgrid::mc::RemoteClient* process = &(mc_model_checker->process());
this->graph_state = std::move(graph_state);
if(this->graph_state->system_state == nullptr)
this->graph_state->system_state = simgrid::mc::take_snapshot(pair_num);
- this->heap_bytes_used = mmalloc_get_bytes_used_remote(
- process->get_heap()->heaplimit,
- process->get_malloc_info());
+ this->heap_bytes_used = mmalloc_get_bytes_used_remote(process->get_heap()->heaplimit, process->get_malloc_info());
this->actors_count = mc_model_checker->process().actors().size();
- this->automaton_state = automaton_state;
- this->num = pair_num;
this->other_num = -1;
this->atomic_propositions = std::move(atomic_propositions);
}
/* Get enabled actors and insert them in the interleave set of the next graph_state */
for (auto& actor : mc_model_checker->process().actors())
if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer()))
- next_pair->graph_state->interleave(actor.copy.getBuffer());
+ next_pair->graph_state->addInterleavingSet(actor.copy.getBuffer());
next_pair->requests = next_pair->graph_state->interleaveSize();
/* FIXME : get search_cycle value for each accepting state */
if (next_pair->automaton_state->type == 1 || (current_pair && current_pair->search_cycle))