X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9819fd4f244a981bf28f677cb7bd05fbcc8f6bcc..d6eb772e45cc853fc204bb5aebeb411cdfa7c929:/src/mc/explo/UdporChecker.cpp diff --git a/src/mc/explo/UdporChecker.cpp b/src/mc/explo/UdporChecker.cpp index c5d596d1f1..550e5b7c7f 100644 --- a/src/mc/explo/UdporChecker.cpp +++ b/src/mc/explo/UdporChecker.cpp @@ -5,7 +5,10 @@ #include "src/mc/explo/UdporChecker.hpp" #include "src/mc/api/State.hpp" -#include "src/mc/explo/udpor/CompatibilityGraph.hpp" +#include "src/mc/explo/udpor/Comb.hpp" +#include "src/mc/explo/udpor/History.hpp" +#include "src/mc/explo/udpor/maximal_subsets_iterator.hpp" + #include #include @@ -13,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_udpor, mc, "Logging specific to verification namespace simgrid::mc::udpor { -UdporChecker::UdporChecker(const std::vector& args) : Exploration(args) +UdporChecker::UdporChecker(const std::vector& args) : Exploration(args, true) { // Initialize the map } @@ -41,13 +44,8 @@ void UdporChecker::run() void UdporChecker::explore(const Configuration& C, EventSet D, EventSet A, std::unique_ptr stateC, EventSet prev_exC) { - // Perform the incremental computation of exC - // - // TODO: This method will have side effects on - // the unfolding, but the naming of the method - // suggests it is doesn't have side effects. We should - // reconcile this in the future - auto [exC, enC] = compute_extension(C, *stateC, prev_exC); + auto exC = compute_exC(C, *stateC, prev_exC); + const auto enC = compute_enC(C, exC); // If enC is a subset of D, intuitively // there aren't any enabled transitions @@ -57,15 +55,16 @@ void UdporChecker::explore(const Configuration& C, EventSet D, EventSet A, std:: if (enC.is_subset_of(D)) { if (not C.get_events().empty()) { - - // g_var::nb_traces++; + // Report information... } // When `en(C)` is empty, intuitively this means that there // are no enabled transitions that can be executed from the // state reached by `C` (denoted `state(C)`), i.e. by some // execution of the transitions in C obeying the causality - // relation. Here, then, we would be in a deadlock. + // relation. Here, then, we may be in a deadlock (the other + // possibility is that we've finished running everything, and + // we wouldn't be in deadlock then) if (enC.empty()) { get_remote_app().check_deadlock(); } @@ -75,13 +74,13 @@ void UdporChecker::explore(const Configuration& C, EventSet D, EventSet A, std:: // TODO: Add verbose logging about which event is being explored - UnfoldingEvent* e = select_next_unfolding_event(A, enC); + const UnfoldingEvent* e = select_next_unfolding_event(A, enC); xbt_assert(e != nullptr, "\n\n****** INVARIANT VIOLATION ******\n" "UDPOR guarantees that an event will be chosen at each point in\n" "the search, yet no events were actually chosen\n" "*********************************\n\n"); - // Move the application into stateCe and actually make note of that state + // Move the application into stateCe and make note of that state move_to_stateCe(*stateC, *e); auto stateCe = record_current_state(); @@ -98,10 +97,8 @@ void UdporChecker::explore(const Configuration& C, EventSet D, EventSet A, std:: // D <-- D + {e} D.insert(e); - // TODO: Determine a value of K to use or don't use it at all constexpr unsigned K = 10; - if (auto J = compute_partial_alternative(D, C, K); !J.empty()) { - J.subtract(C.get_events()); + if (auto J = C.compute_k_partial_alternative_to(D, this->unfolding, K); J.has_value()) { // Before searching the "right half", we need to make // sure the program actually reflects the fact @@ -110,7 +107,8 @@ void UdporChecker::explore(const Configuration& C, EventSet D, EventSet A, std:: restore_program_state_to(*stateC); // Explore(C, D + {e}, J \ C) - explore(C, D, std::move(J), std::move(stateC), std::move(prev_exC)); + auto J_minus_C = J.value().get_events().subtracting(C.get_events()); + explore(C, D, std::move(J_minus_C), std::move(stateC), std::move(prev_exC)); } // D <-- D - {e} @@ -120,8 +118,7 @@ void UdporChecker::explore(const Configuration& C, EventSet D, EventSet A, std:: clean_up_explore(e, C, D); } -std::tuple UdporChecker::compute_extension(const Configuration& C, const State& stateC, - const EventSet& prev_exC) const +EventSet UdporChecker::compute_exC(const Configuration& C, const State& stateC, const EventSet& prev_exC) { // See eqs. 5.7 of section 5.2 of [3] // C = C' + {e_cur}, i.e. C' = C - {e_cur} @@ -129,9 +126,9 @@ std::tuple UdporChecker::compute_extension(const Configurati // Then // // ex(C) = ex(C' + {e_cur}) = ex(C') / {e_cur} + - // U{ : K is maximal, `a` depends on all of K, `a` enabled at K } - UnfoldingEvent* e_cur = C.get_latest_event(); - EventSet exC = prev_exC; + // U{ : K is maximal, `a` depends on all of K, `a` enabled at config(K) } + const UnfoldingEvent* e_cur = C.get_latest_event(); + EventSet exC = prev_exC; exC.remove(e_cur); for (const auto& [aid, actor_state] : stateC.get_actors_list()) { @@ -141,45 +138,57 @@ std::tuple UdporChecker::compute_extension(const Configurati // the set "by hand" const auto specialized_extension_function = incremental_extension_functions.find(transition->type_); if (specialized_extension_function != incremental_extension_functions.end()) { - exC.form_union((specialized_extension_function->second)(C, *transition)); + exC.form_union((specialized_extension_function->second)(C, transition)); } else { - exC.form_union(this->compute_extension_by_enumeration(C, *transition)); + exC.form_union(this->compute_exC_by_enumeration(C, transition)); } } } - - EventSet enC; - // TODO: Compute enC based on conflict relations - - return std::tuple(exC, enC); + return exC; } -EventSet UdporChecker::compute_extension_by_enumeration(const Configuration& C, const Transition& action) const +EventSet UdporChecker::compute_exC_by_enumeration(const Configuration& C, const std::shared_ptr action) { // Here we're computing the following: // - // U{ : K is maximal, `a` depends on all of K, `a` enabled at K } + // U{ : K is maximal, `a` depends on all of K, `a` enabled at config(K) } // - // where `a` is the `action` given to us. + // where `a` is the `action` given to us. Note that `a` is presumed to be enabled EventSet incremental_exC; - // We only consider those combinations of events for which `action` is dependent with - // the action associated with any given event ("`a` depends on all of K") - const std::unique_ptr G = C.make_compatibility_graph_filtered_on([=](const UnfoldingEvent* e) { - const auto e_transition = e->get_transition(); - return action.depends(e_transition); - }); - - // TODO: Now that the graph has been constructed, enumerate - // all possible k-cliques of the complement of G - - // TODO: For each enumeration, check all possible - // combinations of selecting a single event from - // each set associated with the graph nodes - + for (auto begin = + maximal_subsets_iterator(C, {[&](const UnfoldingEvent* e) { return e->is_dependent_with(action.get()); }}); + begin != maximal_subsets_iterator(); ++begin) { + const EventSet& maximal_subset = *begin; + + // Determining if `a` is enabled here might not be possible while looking at `a` opaquely + // We leave the implementation as-is to ensure that any addition would be simple + // if it were ever added + const bool enabled_at_config_k = false; + + if (enabled_at_config_k) { + auto candidate_handle = std::make_unique(maximal_subset, action); + if (auto candidate_event = candidate_handle.get(); not unfolding.contains_event_equivalent_to(candidate_event)) { + // This is a new event (i.e. one we haven't yet seen) + unfolding.insert(std::move(candidate_handle)); + incremental_exC.insert(candidate_event); + } + } + } return incremental_exC; } +EventSet UdporChecker::compute_enC(const Configuration& C, const EventSet& exC) const +{ + EventSet enC; + for (const auto e : exC) { + if (not e->conflicts_with(C)) { + enC.insert(e); + } + } + return enC; +} + void UdporChecker::move_to_stateCe(State& state, const UnfoldingEvent& e) { const aid_t next_actor = e.get_transition()->aid_; @@ -190,13 +199,15 @@ void UdporChecker::move_to_stateCe(State& state, const UnfoldingEvent& e) "one transition of the state of an visited event is enabled, yet no\n" "state was actually enabled. Please report this as a bug.\n" "*********************************\n\n"); - state.execute_next(next_actor); + state.execute_next(next_actor, get_remote_app()); } void UdporChecker::restore_program_state_to(const State& stateC) { - // TODO: Perform state regeneration in the same manner as is done - // in the DFSChecker.cpp + get_remote_app().restore_initial_state(); + // TODO: We need to have the stack of past states available at this + // point. Since the method is recursive, we'll need to keep track of + // this as we progress } std::unique_ptr UdporChecker::record_current_state() @@ -204,12 +215,12 @@ std::unique_ptr UdporChecker::record_current_state() auto next_state = this->get_current_state(); // In UDPOR, we care about all enabled transitions in a given state - next_state->mark_all_enabled_todo(); + next_state->consider_all(); return next_state; } -UnfoldingEvent* UdporChecker::select_next_unfolding_event(const EventSet& A, const EventSet& enC) +const UnfoldingEvent* UdporChecker::select_next_unfolding_event(const EventSet& A, const EventSet& enC) { if (!enC.empty()) { return *(enC.begin()); @@ -223,15 +234,23 @@ UnfoldingEvent* UdporChecker::select_next_unfolding_event(const EventSet& A, con return nullptr; } -EventSet UdporChecker::compute_partial_alternative(const EventSet& D, const Configuration& C, const unsigned k) const -{ - // TODO: Compute k-partial alternatives using [2] - return EventSet(); -} - void UdporChecker::clean_up_explore(const UnfoldingEvent* e, const Configuration& C, const EventSet& D) { - // TODO: Perform clean up here + const EventSet C_union_D = C.get_events().make_union(D); + const EventSet es_immediate_conflicts = this->unfolding.get_immediate_conflicts_of(e); + const EventSet Q_CDU = C_union_D.make_union(es_immediate_conflicts.get_local_config()); + + // Move {e} \ Q_CDU from U to G + if (Q_CDU.contains(e)) { + this->unfolding.remove(e); + } + + // foreach ê in #ⁱ_U(e) + for (const auto* e_hat : es_immediate_conflicts) { + // Move [ê] \ Q_CDU from U to G + const EventSet to_remove = e_hat->get_history().subtracting(Q_CDU); + this->unfolding.remove(to_remove); + } } RecordTrace UdporChecker::get_record_trace()