* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/mc/explo/UdporChecker.hpp"
+#include <xbt/asserts.h>
#include <xbt/log.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_udpor, mc, "Logging specific to MC safety verification ");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_udpor, mc, "Logging specific to verification using UDPOR");
namespace simgrid::mc::udpor {
UdporChecker::UdporChecker(const std::vector<char*>& args) : Exploration(args)
{
/* Create initial data structures, if any ...*/
- XBT_INFO("Starting a UDPOR exploration");
// TODO: Initialize state structures for the search
}
void UdporChecker::run()
{
+ XBT_INFO("Starting a UDPOR exploration");
// NOTE: `A`, `D`, and `C` are derived from the
- // original UDPOR paper [1], while
- // `prev_exC` arises from the incremental computation
- // of ex(C) from the former paper described in [3]
+ // original UDPOR paper [1], while `prev_exC` arises
+ // from the incremental computation of ex(C) from [3]
EventSet A, D;
Configuration C;
EventSet prev_exC;
auto initial_state = get_current_state();
const auto initial_state_id = state_manager_.record_state(std::move(initial_state));
const auto root_event = std::make_unique<UnfoldingEvent>(-1, "", EventSet(), initial_state_id);
- explore(std::move(C), std::move(A), std::move(D), {EventSet()}, root_event.get(), std::move(prev_exC));
+ explore(std::move(C), std::move(A), std::move(D), {}, root_event.get(), std::move(prev_exC));
XBT_INFO("UDPOR exploration terminated -- model checking completed");
}
void UdporChecker::explore(Configuration C, EventSet D, EventSet A, std::list<EventSet> max_evt_history,
- UnfoldingEvent* cur_evt, EventSet prev_exC)
+ UnfoldingEvent* e_cur, EventSet prev_exC)
{
// Perform the incremental computation of exC
- auto [exC, enC] = compute_extension(C, max_evt_history, *cur_evt, prev_exC);
+ auto [exC, enC] = compute_extension(C, max_evt_history, e_cur, prev_exC);
// If enC is a subset of D, intuitively
// there aren't any enabled transitions
// TODO: Add verbose logging about which event is being explored
- observe_unfolding_event(*cur_evt);
- const auto next_state_id = record_newly_visited_state();
+ const auto next_state_id = observe_unfolding_event(*e_cur);
UnfoldingEvent* e = select_next_unfolding_event(A, enC);
- xbt_assert(e != nullptr, "UDPOR guarantees that an event will be chosen at each point in"
- "the search, yet no events were actually chosen");
+ 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");
e->set_state_id(next_state_id);
- // TODO: Clean up configuration code before moving into the actual
- // implementations of everything
-
- // Configuration is the same + event e
- // Ce = C + {e}
+ // Ce := C + {e}
Configuration Ce = C;
Ce.add_event(e);
- max_evt_history.push_back(Ce.get_maxmimal_events());
+ max_evt_history.push_back(Ce.get_maximal_events());
A.remove(e);
exC.remove(e);
max_evt_history.pop_back();
// Explore(C, D + {e}, J \ C)
- explore(C, D, std::move(J), std::move(max_evt_history), cur_evt, std::move(prev_exC));
+ explore(C, D, std::move(J), std::move(max_evt_history), e_cur, std::move(prev_exC));
}
// D <-- D - {e}
std::tuple<EventSet, EventSet> UdporChecker::compute_extension(const Configuration& C,
const std::list<EventSet>& max_evt_history,
- const UnfoldingEvent& cur_event,
- const EventSet& prev_exC) const
+ UnfoldingEvent* e_cur, const EventSet& prev_exC) const
{
- // exC.remove(cur_event);
+ // See eqs. 5.7 of section 5.2 of [3]
+ // ex(C + {e_cur}) = ex(C) / {e_cur} + U{<a, > : H }
+ EventSet exC = prev_exC;
+ exC.remove(e_cur);
- // TODO: Compute extend() as it exists in tiny_simgrid
-
- // exC.subtract(C);
- return std::tuple<EventSet, EventSet>();
+ EventSet enC;
+ return std::tuple<EventSet, EventSet>(exC, enC);
}
State& UdporChecker::get_state_referenced_by(const UnfoldingEvent& event)
const auto state_id = event.get_state_id();
const auto wrapped_state = this->state_manager_.get_state(state_id);
xbt_assert(wrapped_state != std::nullopt,
- "\n\n****** FATAL ERROR ******\n"
- "To each UDPOR event corresponds a state,"
- "but state %lu does not exist\n"
- "******************\n\n",
+ "\n\n****** INVARIANT VIOLATION ******\n"
+ "To each UDPOR event corresponds a state, but state %lu does not exist. "
+ "Please report this as a bug.\n"
+ "*********************************\n\n",
state_id);
return wrapped_state.value().get();
}
-void UdporChecker::observe_unfolding_event(const UnfoldingEvent& event)
+StateHandle UdporChecker::observe_unfolding_event(const UnfoldingEvent& event)
{
auto& state = this->get_state_referenced_by(event);
const aid_t next_actor = state.next_transition();
- xbt_assert(next_actor >= 0, "\n\n****** FATAL ERROR ******\n"
+
+ // TODO: Add the trace if possible for reporting a bug
+ xbt_assert(next_actor >= 0, "\n\n****** INVARIANT VIOLATION ******\n"
"In reaching this execution path, UDPOR ensures that at least one\n"
"one transition of the state of an visited event is enabled, yet no\n"
- "state was actually enabled");
+ "state was actually enabled. Please report this as a bug.\n"
+ "*********************************\n\n");
state.execute_next(next_actor);
+ return this->record_current_state();
}
-StateHandle UdporChecker::record_newly_visited_state()
+StateHandle UdporChecker::record_current_state()
{
auto next_state = this->get_current_state();
const auto next_state_id = this->state_manager_.record_state(std::move(next_state));
