X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aaa2d952c3f91042dc283f8dd4de9dd41b62e3ba..cadc6f2a1e9eea38f5b9cd5f148e1bc282c26981:/src/mc/LivenessChecker.cpp diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp index 5ded308d47..e5613cd6bf 100644 --- a/src/mc/LivenessChecker.cpp +++ b/src/mc/LivenessChecker.cpp @@ -29,6 +29,8 @@ #include "src/mc/mc_replay.h" #include "src/mc/mc_safety.h" #include "src/mc/mc_exit.h" +#include "src/mc/Transition.hpp" +#include "src/mc/Session.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); @@ -92,7 +94,7 @@ static bool evaluate_label( } } -Pair::Pair() : num(++mc_stats->expanded_pairs) +Pair::Pair(unsigned long expanded_pairs) : num(expanded_pairs) {} Pair::~Pair() {} @@ -138,7 +140,7 @@ std::shared_ptr LivenessChecker::insertAcceptancePair(simgrid::mc:: 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; } @@ -157,7 +159,6 @@ void LivenessChecker::removeAcceptancePair(int pair_num) void LivenessChecker::prepare(void) { - mc_model_checker->wait_for_requests(); initial_global_state->snapshot = simgrid::mc::take_snapshot(0); initial_global_state->prev_pair = 0; @@ -199,8 +200,8 @@ void LivenessChecker::replay() if (pair->exploration_started) { - int value; - smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value); + int req_num = state->transition.argument; + smx_simcall_t saved_req = &state->executed_req; smx_simcall_t req = nullptr; @@ -214,16 +215,15 @@ void LivenessChecker::replay() XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, simgrid::mc::request_to_string( - req, value, simgrid::mc::RequestType::simix).c_str(), + req, req_num, simgrid::mc::RequestType::simix).c_str(), state.get()); } - simgrid::mc::handle_simcall(req, value); - mc_model_checker->wait_for_requests(); + this->getSession().execute(state->transition); } /* Update statistics */ - mc_stats->visited_pairs++; + visitedPairsCount_++; mc_stats->executed_transitions++; depth++; @@ -296,18 +296,19 @@ LivenessChecker::~LivenessChecker() RecordTrace LivenessChecker::getRecordTrace() // override { RecordTrace res; - for (std::shared_ptr 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) { - smx_process_t issuer = MC_smx_simcall_get_issuer(req); - const int pid = issuer->pid; - res.push_back(RecordTraceElement(pid, value)); - } - } + for (std::shared_ptr const& pair : explorationStack_) + res.push_back(pair->graph_state->getTransition()); return res; } +void LivenessChecker::logState() // override +{ + Checker::logState(); + XBT_INFO("Expanded pairs = %lu", expandedPairsCount_); + XBT_INFO("Visited pairs = %lu", visitedPairsCount_); + XBT_INFO("Executed transitions = %lu", mc_stats->executed_transitions); +} + void LivenessChecker::showAcceptanceCycle(std::size_t depth) { XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); @@ -317,7 +318,7 @@ void LivenessChecker::showAcceptanceCycle(std::size_t depth) simgrid::mc::dumpRecordPath(); for (auto& s : this->getTextualTrace()) XBT_INFO("%s", s.c_str()); - MC_print_statistics(mc_stats); + simgrid::mc::session->logState(); XBT_INFO("Counter-example depth : %zd", depth); } @@ -325,11 +326,11 @@ std::vector LivenessChecker::getTextualTrace() // override { std::vector trace; for (std::shared_ptr const& pair : explorationStack_) { - int value; - smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value); + int req_num = pair->graph_state->transition.argument; + smx_simcall_t req = &pair->graph_state->executed_req; if (req && req->call != SIMCALL_NONE) trace.push_back(simgrid::mc::request_to_string( - req, value, simgrid::mc::RequestType::executed)); + req, req_num, simgrid::mc::RequestType::executed)); } return trace; } @@ -366,7 +367,9 @@ int LivenessChecker::main(void) && (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); @@ -375,16 +378,18 @@ int LivenessChecker::main(void) continue; } - int value; - smx_simcall_t req = MC_state_get_request(current_pair->graph_state.get(), &value); + smx_simcall_t req = MC_state_get_request(current_pair->graph_state.get()); + int req_num = current_pair->graph_state->transition.argument; 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); + initial_global_state->prev_req = simgrid::mc::request_get_dot_output(req, req_num); if (current_pair->search_cycle) fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num); fflush(dot_output); @@ -392,18 +397,15 @@ int LivenessChecker::main(void) XBT_DEBUG("Execute: %s", simgrid::mc::request_to_string( - req, value, simgrid::mc::RequestType::simix).c_str()); - - /* Set request as executed */ - MC_state_set_executed_request(current_pair->graph_state.get(), req, value); + req, req_num, simgrid::mc::RequestType::simix).c_str()); /* Update mc_stats */ mc_stats->executed_transitions++; if (!current_pair->exploration_started) - mc_stats->visited_pairs++; + visitedPairsCount_++; /* Answer the request */ - simgrid::mc::handle_simcall(req, value); + mc_model_checker->handle_simcall(current_pair->graph_state->transition); /* Wait for requests (schedules processes) */ mc_model_checker->wait_for_requests(); @@ -428,13 +430,13 @@ int LivenessChecker::main(void) } XBT_INFO("No property violation found."); - MC_print_statistics(mc_stats); + simgrid::mc::session->logState(); return SIMGRID_MC_EXIT_SUCCESS; } std::shared_ptr LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state, std::shared_ptr> propositions) { - std::shared_ptr next_pair = std::make_shared(); + std::shared_ptr next_pair = std::make_shared(++expandedPairsCount_); next_pair->automaton_state = state; next_pair->graph_state = std::shared_ptr(MC_state_new()); next_pair->atomic_propositions = std::move(propositions); @@ -445,7 +447,7 @@ std::shared_ptr LivenessChecker::newPair(Pair* current_pair, xbt_automaton /* 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.get(), &p.copy); + next_pair->graph_state->interleave(&p.copy); next_pair->requests = next_pair->graph_state->interleaveSize(); /* FIXME : get search_cycle value for each acceptant state */ if (next_pair->automaton_state->type == 1 ||