#include <algorithm>
#include <memory>
+#include <list>
#include <unistd.h>
#include <sys/wait.h>
#include <xbt/automaton.h>
#include <xbt/dynar.h>
#include <xbt/dynar.hpp>
-#include <xbt/fifo.h>
#include <xbt/log.h>
#include <xbt/sysdep.h>
/********* Global variables *********/
-xbt_dynar_t acceptance_pairs;
-static xbt_fifo_t liveness_stack;
-
/********* Static functions *********/
namespace simgrid {
namespace mc {
-VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, mc_state_t graph_state)
+xbt_dynar_t LivenessChecker::acceptance_pairs;
+std::list<Pair*> LivenessChecker::liveness_stack;
+
+VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, simgrid::mc::State* graph_state)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
xbt_dynar_push_as(this->atomic_propositions.get(), int, value);
}
-static int is_exploration_stack_pair(simgrid::mc::VisitedPair* pair){
- xbt_fifo_item_t item = xbt_fifo_get_first_item(liveness_stack);
- while (item) {
- if (((simgrid::mc::Pair*)xbt_fifo_get_item_content(item))->num == pair->num){
- ((simgrid::mc::Pair*)xbt_fifo_get_item_content(item))->visited_pair_removed = 1;
- return 1;
+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;
}
- item = xbt_fifo_get_next_item(item);
}
- return 0;
+ return false;
}
VisitedPair::~VisitedPair()
int res = xbt_automaton_propositional_symbol_evaluate(ps);
xbt_dynar_push_as(values.get(), int, res);
}
- return std::move(values);
+ return values;
}
int LivenessChecker::compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2)
{
- simgrid::mc::Snapshot* s1 = state1->graph_state->system_state;
- simgrid::mc::Snapshot* s2 = state2->graph_state->system_state;
+ simgrid::mc::Snapshot* s1 = state1->graph_state->system_state.get();
+ simgrid::mc::Snapshot* s2 = state2->graph_state->system_state.get();
int num1 = state1->num;
int num2 = state2->num;
return simgrid::mc::snapshot_compare(num1, s1, num2, s2);
simgrid::mc::VisitedPair* LivenessChecker::insertAcceptancePair(simgrid::mc::Pair* pair)
{
- auto acceptance_pairs = simgrid::xbt::range<simgrid::mc::VisitedPair*>(::acceptance_pairs);
+ 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(),
new_pair->atomic_propositions.get()) == 0) {
if (this->compare(pair_test, new_pair.get()) == 0) {
XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
- xbt_fifo_shift(liveness_stack);
+ liveness_stack.pop_back();
if (dot_output != nullptr)
fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, pair_test->num, initial_global_state->prev_req);
return nullptr;
auto new_raw_pair = new_pair.release();
xbt_dynar_insert_at(
- ::acceptance_pairs, res.first - acceptance_pairs.begin(), &new_raw_pair);
+ LivenessChecker::acceptance_pairs, res.first - acceptance_pairs.begin(), &new_raw_pair);
return new_raw_pair;
}
initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state);
initial_pair->search_cycle = 0;
- xbt_fifo_unshift(liveness_stack, initial_pair);
+ liveness_stack.push_back(initial_pair);
}
}
}
-void LivenessChecker::replay(xbt_fifo_t stack)
+void LivenessChecker::replay()
{
- xbt_fifo_item_t item;
- simgrid::mc::Pair* pair = nullptr;
- mc_state_t state = nullptr;
+ simgrid::mc::State* state = nullptr;
smx_simcall_t req = nullptr, saved_req = NULL;
int value, depth = 1;
char *req_str;
/* Intermediate backtracking */
if(_sg_mc_checkpoint > 0) {
- item = xbt_fifo_get_first_item(stack);
- pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
+ simgrid::mc::Pair* pair = liveness_stack.back();
if(pair->graph_state->system_state){
simgrid::mc::restore_snapshot(pair->graph_state->system_state);
return;
/* Restore the initial state */
simgrid::mc::restore_snapshot(initial_global_state->snapshot);
- /* Traverse the stack from the initial state and re-execute the transitions */
- for (item = xbt_fifo_get_last_item(stack);
- item != xbt_fifo_get_first_item(stack);
- item = xbt_fifo_get_prev_item(item)) {
-
- pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
+ /* Traverse the stack from the initial state and re-execute the transitions */
+ for (simgrid::mc::Pair* pair : liveness_stack) {
+ if (pair == liveness_stack.back())
+ break;
- state = (mc_state_t) pair->graph_state;
+ state = (simgrid::mc::State*) pair->graph_state;
if (pair->exploration_started) {
depth++;
- }
+ }
XBT_DEBUG("**** End Replay ****");
}
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 (!mc_model_checker->is_important_snapshot(*pair_test->graph_state->system_state)
- && pair_test->num < min2) {
+ if (pair_test->num < min2) {
index2 = i;
min2 = pair_test->num;
}
RecordTrace LivenessChecker::getRecordTrace() // override
{
RecordTrace res;
-
- xbt_fifo_item_t start = xbt_fifo_get_last_item(liveness_stack);
- for (xbt_fifo_item_t item = start; item; item = xbt_fifo_get_prev_item(item)) {
- simgrid::mc::Pair* pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
+ for (simgrid::mc::Pair* pair : liveness_stack) {
int value;
smx_simcall_t req = MC_state_get_executed_request(pair->graph_state, &value);
if (req && req->call != SIMCALL_NONE) {
res.push_back(RecordTraceElement(pid, value));
}
}
-
- return std::move(res);
+ return res;
}
void LivenessChecker::showAcceptanceCycle(std::size_t depth)
std::vector<std::string> LivenessChecker::getTextualTrace() // override
{
std::vector<std::string> trace;
- for (xbt_fifo_item_t item = xbt_fifo_get_last_item(liveness_stack);
- item; item = xbt_fifo_get_prev_item(item)) {
- simgrid::mc::Pair* pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
+ for (simgrid::mc::Pair* pair : liveness_stack) {
int value;
smx_simcall_t req = MC_state_get_executed_request(pair->graph_state, &value);
if (req && req->call != SIMCALL_NONE) {
xbt_free(req_str);
}
}
- return std::move(trace);
+ return trace;
}
int LivenessChecker::main(void)
simgrid::xbt::unique_ptr<s_xbt_dynar_t> prop_values;
simgrid::mc::VisitedPair* reached_pair = nullptr;
- while(xbt_fifo_size(liveness_stack) > 0){
+ while (!liveness_stack.empty()){
/* Get current pair */
- current_pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(xbt_fifo_get_first_item(liveness_stack));
+ current_pair = liveness_stack.back();
/* Update current state in buchi automaton */
simgrid::mc::property_automaton->current_state = current_pair->automaton_state;
next_pair->search_cycle = 1;
/* Add new pair to the exploration stack */
- xbt_fifo_unshift(liveness_stack, next_pair);
+ liveness_stack.push_back(next_pair);
}
cursor--;
/* Traverse the stack backwards until a pair with a non empty interleave
set is found, deleting all the pairs that have it empty in the way. */
- while ((current_pair = (simgrid::mc::Pair*) xbt_fifo_shift(liveness_stack)) != nullptr) {
+ while (!liveness_stack.empty()) {
+ current_pair = liveness_stack.back();
+ liveness_stack.pop_back();
if (current_pair->requests > 0) {
/* We found a backtracking point */
XBT_DEBUG("Backtracking to depth %d", current_pair->depth);
- xbt_fifo_unshift(liveness_stack, current_pair);
- this->replay(liveness_stack);
+ liveness_stack.push_back(current_pair);
+ this->replay();
XBT_DEBUG("Backtracking done");
break;
}else{
} /* End of if (current_pair->requests > 0) else ... */
- } /* End of while(xbt_fifo_size(liveness_stack) > 0) */
+ }
XBT_INFO("No property violation found.");
MC_print_statistics(mc_stats);
_sg_mc_liveness = 1;
/* Create exploration stack */
- liveness_stack = xbt_fifo_new();
+ liveness_stack.clear();
/* Create the initial state */
- initial_global_state = xbt_new0(s_mc_global_t, 1);
+ simgrid::mc::initial_global_state = std::unique_ptr<s_mc_global_t>(new s_mc_global_t());
this->prepare();
- return this->main();
+ int res = this->main();
+ simgrid::mc::initial_global_state = nullptr;
+ return res;
}
}
