namespace simgrid {
namespace mc {
-xbt_dynar_t LivenessChecker::acceptance_pairs;
+std::list<std::shared_ptr<VisitedPair>> LivenessChecker::acceptance_pairs;
std::list<Pair*> LivenessChecker::liveness_stack;
+std::list<std::shared_ptr<VisitedPair>> LivenessChecker::visited_pairs;
-VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, simgrid::mc::State* graph_state)
+VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, std::shared_ptr<simgrid::mc::State> graph_state)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
- this->graph_state = graph_state;
+ 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(
this->automaton_state = automaton_state;
this->num = pair_num;
this->other_num = -1;
- this->acceptance_removed = 0;
- this->visited_removed = 0;
this->acceptance_pair = 0;
this->atomic_propositions = simgrid::xbt::unique_ptr<s_xbt_dynar_t>(
xbt_dynar_new(sizeof(int), nullptr));
xbt_dynar_push_as(this->atomic_propositions.get(), int, value);
}
-static int is_exploration_stack_pair(simgrid::mc::VisitedPair* pair)
-{
- for (auto i = LivenessChecker::liveness_stack.rbegin(); i != LivenessChecker::liveness_stack.rend(); ++i) {
- if ((*i)->num == pair->num) {
- (*i)->visited_pair_removed = 1;
- return true;
- }
- }
- return false;
-}
-
VisitedPair::~VisitedPair()
{
- if( !is_exploration_stack_pair(this))
- MC_state_delete(this->graph_state, 1);
}
static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l,
}
}
-static xbt_dynar_t visited_pairs;
-
-Pair::Pair() : num(++mc_stats->expanded_pairs),
- visited_pair_removed(_sg_mc_visited > 0 ? 0 : 1)
+Pair::Pair() : num(++mc_stats->expanded_pairs)
{}
-Pair::~Pair() {
- if (this->visited_pair_removed)
- MC_state_delete(this->graph_state, 1);
-}
+Pair::~Pair() {}
simgrid::xbt::unique_ptr<s_xbt_dynar_t> LivenessChecker::getPropositionValues()
{
return simgrid::mc::snapshot_compare(num1, s1, num2, s2);
}
-simgrid::mc::VisitedPair* LivenessChecker::insertAcceptancePair(simgrid::mc::Pair* pair)
+std::shared_ptr<VisitedPair> LivenessChecker::insertAcceptancePair(simgrid::mc::Pair* pair)
{
- auto acceptance_pairs = simgrid::xbt::range<simgrid::mc::VisitedPair*>(LivenessChecker::acceptance_pairs);
- auto new_pair =
- std::unique_ptr<simgrid::mc::VisitedPair>(new VisitedPair(
- pair->num, pair->automaton_state, pair->atomic_propositions.get(),
- pair->graph_state));
+ std::shared_ptr<VisitedPair> new_pair = std::make_shared<VisitedPair>(
+ pair->num, pair->automaton_state, pair->atomic_propositions.get(),
+ pair->graph_state);
new_pair->acceptance_pair = 1;
auto res = std::equal_range(acceptance_pairs.begin(), acceptance_pairs.end(),
- new_pair, simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
+ new_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
if (pair->search_cycle == 1)
for (auto i = res.first; i != res.second; ++i) {
- simgrid::mc::VisitedPair* pair_test = *i;
+ std::shared_ptr<simgrid::mc::VisitedPair> const& pair_test = *i;
if (xbt_automaton_state_compare(pair_test->automaton_state, new_pair->automaton_state) == 0) {
if (xbt_automaton_propositional_symbols_compare_value(
pair_test->atomic_propositions.get(),
new_pair->atomic_propositions.get()) == 0) {
- if (this->compare(pair_test, new_pair.get()) == 0) {
+ if (this->compare(pair_test.get(), new_pair.get()) == 0) {
XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
liveness_stack.pop_back();
if (dot_output != nullptr)
}
}
- auto new_raw_pair = new_pair.release();
- xbt_dynar_insert_at(
- LivenessChecker::acceptance_pairs, res.first - acceptance_pairs.begin(), &new_raw_pair);
- return new_raw_pair;
+ acceptance_pairs.insert(res.first, new_pair);
+ return new_pair;
}
void LivenessChecker::removeAcceptancePair(int pair_num)
{
- unsigned int cursor = 0;
- simgrid::mc::VisitedPair* pair_test = nullptr;
- int pair_found = 0;
-
- xbt_dynar_foreach(acceptance_pairs, cursor, pair_test)
- if (pair_test->num == pair_num) {
- pair_found = 1;
+ for (auto i = acceptance_pairs.begin(); i != acceptance_pairs.end(); ++i)
+ if ((*i)->num == pair_num) {
+ acceptance_pairs.erase(i);
break;
}
-
- if(pair_found == 1) {
- xbt_dynar_remove_at(acceptance_pairs, cursor, &pair_test);
-
- pair_test->acceptance_removed = 1;
-
- if (_sg_mc_visited == 0 || pair_test->visited_removed == 1)
- delete pair_test;
-
- }
}
void LivenessChecker::prepare(void)
{
simgrid::mc::Pair* initial_pair = nullptr;
mc_model_checker->wait_for_requests();
- acceptance_pairs = xbt_dynar_new(sizeof(simgrid::mc::VisitedPair*), nullptr);
- if(_sg_mc_visited > 0)
- simgrid::mc::visited_pairs = xbt_dynar_new(sizeof(simgrid::mc::VisitedPair*), nullptr);
+
+ acceptance_pairs.clear();
+ visited_pairs.clear();
initial_global_state->snapshot = simgrid::mc::take_snapshot(0);
initial_global_state->prev_pair = 0;
initial_pair = new Pair();
initial_pair->automaton_state = automaton_state;
- initial_pair->graph_state = MC_state_new();
+ initial_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
initial_pair->atomic_propositions = this->getPropositionValues();
initial_pair->depth = 1;
/* Get enabled processes and insert them in the interleave set of the graph_state */
for (auto& p : mc_model_checker->process().simix_processes())
if (simgrid::mc::process_is_enabled(&p.copy))
- MC_state_interleave_process(initial_pair->graph_state, &p.copy);
+ MC_state_interleave_process(initial_pair->graph_state.get(), &p.copy);
- initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state);
+ initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state.get());
initial_pair->search_cycle = 0;
liveness_stack.push_back(initial_pair);
void LivenessChecker::replay()
{
- simgrid::mc::State* state = nullptr;
smx_simcall_t req = nullptr, saved_req = NULL;
int value, depth = 1;
char *req_str;
if (pair == liveness_stack.back())
break;
- state = (simgrid::mc::State*) pair->graph_state;
+ std::shared_ptr<State> state = pair->graph_state;
if (pair->exploration_started) {
- saved_req = MC_state_get_executed_request(state, &value);
+ saved_req = MC_state_get_executed_request(state.get(), &value);
if (saved_req != nullptr) {
/* because we got a copy of the executed request, we have to fetch the
/* Debug information */
if (XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) {
req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
- XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
+ XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state.get());
xbt_free(req_str);
}
/**
* \brief Checks whether a given pair has already been visited by the algorithm.
*/
-int LivenessChecker::insertVisitedPair(simgrid::mc::VisitedPair* visited_pair, simgrid::mc::Pair* pair)
+int LivenessChecker::insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair, simgrid::mc::Pair* pair)
{
if (_sg_mc_visited == 0)
return -1;
- simgrid::mc::VisitedPair* new_visited_pair = nullptr;
if (visited_pair == nullptr)
- new_visited_pair = new simgrid::mc::VisitedPair(
+ visited_pair = std::make_shared<VisitedPair>(
pair->num, pair->automaton_state, pair->atomic_propositions.get(),
pair->graph_state);
- else
- new_visited_pair = visited_pair;
-
- auto visited_pairs = simgrid::xbt::range<simgrid::mc::VisitedPair*>(simgrid::mc::visited_pairs);
auto range = std::equal_range(visited_pairs.begin(), visited_pairs.end(),
- new_visited_pair, simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
+ visited_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
for (auto i = range.first; i != range.second; ++i) {
- simgrid::mc::VisitedPair* pair_test = *i;
- std::size_t cursor = i - visited_pairs.begin();
- if (xbt_automaton_state_compare(pair_test->automaton_state, new_visited_pair->automaton_state) == 0) {
+ VisitedPair* pair_test = i->get();
+ if (xbt_automaton_state_compare(pair_test->automaton_state, visited_pair->automaton_state) == 0) {
if (xbt_automaton_propositional_symbols_compare_value(
pair_test->atomic_propositions.get(),
- new_visited_pair->atomic_propositions.get()) == 0) {
- if (this->compare(pair_test, new_visited_pair) == 0) {
+ visited_pair->atomic_propositions.get()) == 0) {
+ if (this->compare(pair_test, visited_pair.get()) == 0) {
if (pair_test->other_num == -1)
- new_visited_pair->other_num = pair_test->num;
+ visited_pair->other_num = pair_test->num;
else
- new_visited_pair->other_num = pair_test->other_num;
+ visited_pair->other_num = pair_test->other_num;
if (dot_output == nullptr)
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_visited_pair->num, pair_test->num);
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d)",
+ visited_pair->num, pair_test->num);
else
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", new_visited_pair->num, pair_test->num, new_visited_pair->other_num);
- xbt_dynar_remove_at(simgrid::mc::visited_pairs, cursor, &pair_test);
- xbt_dynar_insert_at(simgrid::mc::visited_pairs, cursor, &new_visited_pair);
- pair_test->visited_removed = 1;
- if (!pair_test->acceptance_pair
- || pair_test->acceptance_removed == 1)
- delete pair_test;
- return new_visited_pair->other_num;
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))",
+ visited_pair->num, pair_test->num, visited_pair->other_num);
+ (*i) = std::move(visited_pair);
+ return (*i)->other_num;
}
}
}
}
- xbt_dynar_insert_at(simgrid::mc::visited_pairs, range.first - visited_pairs.begin(), &new_visited_pair);
+ visited_pairs.insert(range.first, std::move(visited_pair));
- if ((ssize_t) visited_pairs.size() > _sg_mc_visited) {
+ if (visited_pairs.size() > (std::size_t) _sg_mc_visited) {
int min2 = mc_stats->expanded_pairs;
- unsigned int index2 = 0;
- for (std::size_t i = 0; i != (std::size_t) visited_pairs.size(); ++i) {
- simgrid::mc::VisitedPair* pair_test = visited_pairs[i];
- if (pair_test->num < min2) {
+
+ std::list<std::shared_ptr<VisitedPair>>::iterator index2;
+ for (auto i = visited_pairs.begin(); i != visited_pairs.end(); ++i) {
+ if ((*i)->num < min2) {
index2 = i;
- min2 = pair_test->num;
+ min2 = (*i)->num;
}
}
- simgrid::mc::VisitedPair* pair_test = nullptr;
- xbt_dynar_remove_at(simgrid::mc::visited_pairs, index2, &pair_test);
- pair_test->visited_removed = 1;
- if (!pair_test->acceptance_pair || pair_test->acceptance_removed)
- delete pair_test;
+
+ visited_pairs.erase(index2);
}
return -1;
RecordTrace res;
for (simgrid::mc::Pair* pair : liveness_stack) {
int value;
- smx_simcall_t req = MC_state_get_executed_request(pair->graph_state, &value);
+ smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value);
if (req && req->call != SIMCALL_NONE) {
smx_process_t issuer = MC_smx_simcall_get_issuer(req);
const int pid = issuer->pid;
std::vector<std::string> trace;
for (simgrid::mc::Pair* pair : liveness_stack) {
int value;
- smx_simcall_t req = MC_state_get_executed_request(pair->graph_state, &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));
smx_simcall_t req = nullptr;
xbt_automaton_transition_t transition_succ = nullptr;
int cursor = 0;
- simgrid::mc::Pair* next_pair = nullptr;
simgrid::xbt::unique_ptr<s_xbt_dynar_t> prop_values;
- simgrid::mc::VisitedPair* reached_pair = nullptr;
+ std::shared_ptr<VisitedPair> reached_pair = nullptr;
while (!liveness_stack.empty()){
XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %d, pair_num = %d, requests = %d)",
current_pair->depth, current_pair->search_cycle,
- MC_state_interleave_size(current_pair->graph_state), current_pair->num,
+ MC_state_interleave_size(current_pair->graph_state.get()), current_pair->num,
current_pair->requests);
if (current_pair->requests > 0) {
}else{
- req = MC_state_get_request(current_pair->graph_state, &value);
+ req = MC_state_get_request(current_pair->graph_state.get(), &value);
if (dot_output != nullptr) {
if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) {
xbt_free(req_str);
/* Set request as executed */
- MC_state_set_executed_request(current_pair->graph_state, req, value);
+ MC_state_set_executed_request(current_pair->graph_state.get(), req, value);
/* Update mc_stats */
mc_stats->executed_transitions++;
transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t);
res = MC_automaton_evaluate_label(transition_succ->label, prop_values.get());
if (res == 1 || res == 2) { /* 1 = True transition (always enabled), 2 = enabled transition according to atomic prop values */
- next_pair = new Pair();
- next_pair->graph_state = MC_state_new();
+ Pair* next_pair = new Pair();
+ next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
next_pair->automaton_state = transition_succ->dst;
next_pair->atomic_propositions = this->getPropositionValues();
next_pair->depth = current_pair->depth + 1;
/* Get enabled processes and insert them in the interleave set of the next graph_state */
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, &p.copy);
+ MC_state_interleave_process(next_pair->graph_state.get(), &p.copy);
- next_pair->requests = MC_state_interleave_size(next_pair->graph_state);
+ next_pair->requests = MC_state_interleave_size(next_pair->graph_state.get());
/* FIXME : get search_cycle value for each acceptant state */
if (next_pair->automaton_state->type == 1 || current_pair->search_cycle)
this->prepare();
int res = this->main();
simgrid::mc::initial_global_state = nullptr;
+
+ acceptance_pairs.clear();
+ visited_pairs.clear();
+
return res;
}
