VisitedPair::VisitedPair(
int pair_num, xbt_automaton_state_t automaton_state,
- std::vector<int> const& atomic_propositions, std::shared_ptr<simgrid::mc::State> graph_state)
+ std::shared_ptr<const std::vector<int>> atomic_propositions,
+ std::shared_ptr<simgrid::mc::State> graph_state)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
this->automaton_state = automaton_state;
this->num = pair_num;
this->other_num = -1;
- this->atomic_propositions = atomic_propositions;
+ this->atomic_propositions = std::move(atomic_propositions);
}
VisitedPair::~VisitedPair()
Pair::~Pair() {}
-std::vector<int> LivenessChecker::getPropositionValues()
+std::shared_ptr<const std::vector<int>> LivenessChecker::getPropositionValues()
{
std::vector<int> values;
unsigned int cursor = 0;
xbt_automaton_propositional_symbol_t ps = nullptr;
xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, ps)
values.push_back(xbt_automaton_propositional_symbol_evaluate(ps));
- return values;
+ return std::make_shared<const std::vector<int>>(std::move(values));
}
int LivenessChecker::compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2)
std::shared_ptr<simgrid::mc::VisitedPair> const& pair_test = *i;
if (xbt_automaton_state_compare(
pair_test->automaton_state, new_pair->automaton_state) != 0
- || pair_test->atomic_propositions != new_pair->atomic_propositions
+ || *(pair_test->atomic_propositions) != *(new_pair->atomic_propositions)
|| this->compare(pair_test.get(), new_pair.get()) != 0)
continue;
XBT_INFO("Pair %d already reached (equal to pair %d) !",
if (dot_output != nullptr)
fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
initial_global_state->prev_pair, pair_test->num,
- initial_global_state->prev_req);
+ initial_global_state->prev_req.c_str());
return nullptr;
}
initial_global_state->snapshot = simgrid::mc::take_snapshot(0);
initial_global_state->prev_pair = 0;
+ std::shared_ptr<const std::vector<int>> propos = this->getPropositionValues();
+
// For each initial state of the property automaton, push a
// (application_state, automaton_state) pair to the exploration stack:
unsigned int cursor = 0;
xbt_automaton_state_t automaton_state;
xbt_dynar_foreach(simgrid::mc::property_automaton->states, cursor, automaton_state)
if (automaton_state->type == -1)
- explorationStack_.push_back(this->newPair(nullptr, automaton_state));
+ explorationStack_.push_back(this->newPair(nullptr, automaton_state, propos));
}
req = &issuer->simcall;
/* Debug information */
- if (XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) {
- char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
- XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state.get());
- xbt_free(req_str);
- }
-
+ XBT_DEBUG("Replay (depth = %d) : %s (%p)",
+ depth,
+ simgrid::mc::request_to_string(
+ req, value, simgrid::mc::RequestType::simix).c_str(),
+ state.get());
}
simgrid::mc::handle_simcall(req, value);
VisitedPair* pair_test = i->get();
if (xbt_automaton_state_compare(
pair_test->automaton_state, visited_pair->automaton_state) != 0
- || pair_test->atomic_propositions != visited_pair->atomic_propositions
+ || *(pair_test->atomic_propositions) != *(visited_pair->atomic_propositions)
|| this->compare(pair_test, visited_pair.get()) != 0)
continue;
if (pair_test->other_num == -1)
for (std::shared_ptr<Pair> const& pair : explorationStack_) {
int value;
smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value);
- if (req && req->call != SIMCALL_NONE) {
- char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed);
- trace.push_back(std::string(req_str));
- xbt_free(req_str);
- }
+ if (req && req->call != SIMCALL_NONE)
+ trace.push_back(simgrid::mc::request_to_string(
+ req, value, simgrid::mc::RequestType::executed));
}
return trace;
}
/* Update current state in buchi automaton */
simgrid::mc::property_automaton->current_state = current_pair->automaton_state;
- XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %d, pair_num = %d, requests = %d)",
+ XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %zd, pair_num = %d, requests = %d)",
current_pair->depth, current_pair->search_cycle,
- MC_state_interleave_size(current_pair->graph_state.get()), current_pair->num,
+ current_pair->graph_state->interleaveSize(),
+ current_pair->num,
current_pair->requests);
if (current_pair->requests == 0) {
&& (visited_num = this->insertVisitedPair(
reached_pair, current_pair.get())) != -1) {
if (dot_output != nullptr){
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, visited_num, initial_global_state->prev_req);
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+ initial_global_state->prev_pair, visited_num,
+ initial_global_state->prev_req.c_str());
fflush(dot_output);
}
XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
if (dot_output != nullptr) {
if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) {
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, current_pair->num, initial_global_state->prev_req);
- xbt_free(initial_global_state->prev_req);
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+ initial_global_state->prev_pair, current_pair->num,
+ initial_global_state->prev_req.c_str());
+ initial_global_state->prev_req.clear();
}
initial_global_state->prev_pair = current_pair->num;
initial_global_state->prev_req = simgrid::mc::request_get_dot_output(req, value);
fflush(dot_output);
}
- char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
- XBT_DEBUG("Execute: %s", req_str);
- xbt_free(req_str);
-
- /* Set request as executed */
- MC_state_set_executed_request(current_pair->graph_state.get(), req, value);
+ XBT_DEBUG("Execute: %s",
+ simgrid::mc::request_to_string(
+ req, value, simgrid::mc::RequestType::simix).c_str());
/* Update mc_stats */
mc_stats->executed_transitions++;
current_pair->exploration_started = true;
/* Get values of atomic propositions (variables used in the property formula) */
- std::vector<int> prop_values = this->getPropositionValues();
+ std::shared_ptr<const std::vector<int>> prop_values = this->getPropositionValues();
// For each enabled transition in the property automaton, push a
// (application_state, automaton_state) pair to the exploration stack:
int cursor = xbt_dynar_length(current_pair->automaton_state->out) - 1;
while (cursor >= 0) {
xbt_automaton_transition_t transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t);
- if (evaluate_label(transition_succ->label, prop_values))
+ if (evaluate_label(transition_succ->label, *prop_values))
explorationStack_.push_back(this->newPair(
- current_pair.get(), transition_succ->dst));
+ current_pair.get(), transition_succ->dst, prop_values));
cursor--;
}
return SIMGRID_MC_EXIT_SUCCESS;
}
-std::shared_ptr<Pair> LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state)
+std::shared_ptr<Pair> LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state, std::shared_ptr<const std::vector<int>> propositions)
{
std::shared_ptr<Pair> next_pair = std::make_shared<Pair>();
next_pair->automaton_state = state;
next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
- next_pair->atomic_propositions = this->getPropositionValues();
+ next_pair->atomic_propositions = std::move(propositions);
if (current_pair)
next_pair->depth = current_pair->depth + 1;
else
for (auto& p : mc_model_checker->process().simix_processes())
if (simgrid::mc::process_is_enabled(&p.copy))
MC_state_interleave_process(next_pair->graph_state.get(), &p.copy);
- next_pair->requests = MC_state_interleave_size(next_pair->graph_state.get());
+ next_pair->requests = next_pair->graph_state->interleaveSize();
/* FIXME : get search_cycle value for each acceptant state */
if (next_pair->automaton_state->type == 1 ||
(current_pair && current_pair->search_cycle))
