X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f756b051175054c62c4741fdab2a6b934828262..2ef958bf49890e4ac8fbe179f1d339b923fb67a8:/src/mc/explo/odpor/ReversibleRaceCalculator.cpp diff --git a/src/mc/explo/odpor/ReversibleRaceCalculator.cpp b/src/mc/explo/odpor/ReversibleRaceCalculator.cpp index f2db6b6b9a..d35c167d67 100644 --- a/src/mc/explo/odpor/ReversibleRaceCalculator.cpp +++ b/src/mc/explo/odpor/ReversibleRaceCalculator.cpp @@ -5,45 +5,58 @@ #include "src/mc/explo/odpor/ReversibleRaceCalculator.hpp" #include "src/mc/explo/odpor/Execution.hpp" +#include "src/mc/transition/Transition.hpp" +#include "src/mc/transition/TransitionSynchro.hpp" #include #include #include #include +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_odpor_reversible_race, mc_dfs, "ODPOR exploration algorithm of the model-checker"); + namespace simgrid::mc::odpor { +/** + The reversible race detector should only be used if we already have the assumption + e1 <* e2 (see Source set: a foundation for ODPOR). In particular this means that : + - e1 -->_E e2 + - proc(e1) != proc(e2) + - there is no event e3 s.t. e1 --> e3 --> e2 +*/ + bool ReversibleRaceCalculator::is_race_reversible(const Execution& E, Execution::EventHandle e1, Execution::EventHandle e2) { using Action = Transition::Type; - using Handler = std::function; + using Handler = std::function; using HandlerMap = std::unordered_map; - const static HandlerMap handlers = - HandlerMap{{Action::ACTOR_JOIN, &ReversibleRaceCalculator::is_race_reversible_ActorJoin}, - {Action::BARRIER_ASYNC_LOCK, &ReversibleRaceCalculator::is_race_reversible_BarrierAsyncLock}, - {Action::BARRIER_WAIT, &ReversibleRaceCalculator::is_race_reversible_BarrierWait}, - {Action::COMM_ASYNC_SEND, &ReversibleRaceCalculator::is_race_reversible_CommSend}, - {Action::COMM_ASYNC_RECV, &ReversibleRaceCalculator::is_race_reversible_CommRecv}, - {Action::COMM_TEST, &ReversibleRaceCalculator::is_race_reversible_CommTest}, - {Action::COMM_WAIT, &ReversibleRaceCalculator::is_race_reversible_CommWait}, - {Action::MUTEX_ASYNC_LOCK, &ReversibleRaceCalculator::is_race_reversible_MutexAsyncLock}, - {Action::MUTEX_TEST, &ReversibleRaceCalculator::is_race_reversible_MutexTest}, - {Action::MUTEX_TRYLOCK, &ReversibleRaceCalculator::is_race_reversible_MutexTrylock}, - {Action::MUTEX_UNLOCK, &ReversibleRaceCalculator::is_race_reversible_MutexUnlock}, - {Action::MUTEX_WAIT, &ReversibleRaceCalculator::is_race_reversible_MutexWait}, - {Action::OBJECT_ACCESS, &ReversibleRaceCalculator::is_race_reversible_ObjectAccess}, - {Action::RANDOM, &ReversibleRaceCalculator::is_race_reversible_Random}, - {Action::SEM_ASYNC_LOCK, &ReversibleRaceCalculator::is_race_reversible_SemAsyncLock}, - {Action::SEM_UNLOCK, &ReversibleRaceCalculator::is_race_reversible_SemUnlock}, - {Action::SEM_WAIT, &ReversibleRaceCalculator::is_race_reversible_SemWait}, - {Action::TESTANY, &ReversibleRaceCalculator::is_race_reversible_TestAny}, - {Action::WAITANY, &ReversibleRaceCalculator::is_race_reversible_WaitAny}}; - - const auto* e2_action = E.get_transition_for_handle(e2); - if (const auto handler = handlers.find(e2_action->type_); handler != handlers.end()) { - return handler->second(E, e1, e2_action); + const static HandlerMap handlers = { + {Action::ACTOR_JOIN, &ReversibleRaceCalculator::is_race_reversible_ActorJoin}, + {Action::BARRIER_ASYNC_LOCK, &ReversibleRaceCalculator::is_race_reversible_BarrierAsyncLock}, + {Action::BARRIER_WAIT, &ReversibleRaceCalculator::is_race_reversible_BarrierWait}, + {Action::COMM_ASYNC_SEND, &ReversibleRaceCalculator::is_race_reversible_CommSend}, + {Action::COMM_ASYNC_RECV, &ReversibleRaceCalculator::is_race_reversible_CommRecv}, + {Action::COMM_TEST, &ReversibleRaceCalculator::is_race_reversible_CommTest}, + {Action::COMM_WAIT, &ReversibleRaceCalculator::is_race_reversible_CommWait}, + {Action::MUTEX_ASYNC_LOCK, &ReversibleRaceCalculator::is_race_reversible_MutexAsyncLock}, + {Action::MUTEX_TEST, &ReversibleRaceCalculator::is_race_reversible_MutexTest}, + {Action::MUTEX_TRYLOCK, &ReversibleRaceCalculator::is_race_reversible_MutexTrylock}, + {Action::MUTEX_UNLOCK, &ReversibleRaceCalculator::is_race_reversible_MutexUnlock}, + {Action::MUTEX_WAIT, &ReversibleRaceCalculator::is_race_reversible_MutexWait}, + {Action::OBJECT_ACCESS, &ReversibleRaceCalculator::is_race_reversible_ObjectAccess}, + {Action::RANDOM, &ReversibleRaceCalculator::is_race_reversible_Random}, + {Action::SEM_ASYNC_LOCK, &ReversibleRaceCalculator::is_race_reversible_SemAsyncLock}, + {Action::SEM_UNLOCK, &ReversibleRaceCalculator::is_race_reversible_SemUnlock}, + {Action::SEM_WAIT, &ReversibleRaceCalculator::is_race_reversible_SemWait}, + {Action::TESTANY, &ReversibleRaceCalculator::is_race_reversible_TestAny}, + {Action::WAITANY, &ReversibleRaceCalculator::is_race_reversible_WaitAny}}; + + const auto* other_transition = E.get_transition_for_handle(e1); + const auto* t2 = E.get_transition_for_handle(e2); + if (const auto handler = handlers.find(t2->type_); handler != handlers.end()) { + return handler->second(E, other_transition, t2); } else { xbt_die("There is currently no specialized computation for the transition " "'%s' for computing reversible races in ODPOR, so the model checker cannot " @@ -51,12 +64,12 @@ bool ReversibleRaceCalculator::is_race_reversible(const Execution& E, Execution: "that the transition be supported in SimGrid using ODPPR and consider " "using the other model-checking algorithms supported by SimGrid instead " "in the meantime", - e2_action->to_string().c_str()); + t2->to_string().c_str()); } } -bool ReversibleRaceCalculator::is_race_reversible_ActorJoin(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_ActorJoin(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // ActorJoin races with another event iff its target `T` is the same as // the actor executing the other transition. Clearly, then, we could not join @@ -64,136 +77,143 @@ bool ReversibleRaceCalculator::is_race_reversible_ActorJoin(const Execution&, Ex return false; } -bool ReversibleRaceCalculator::is_race_reversible_BarrierAsyncLock(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_BarrierAsyncLock(const Execution&, + const Transition* /*other_transition*/, + const Transition* /*t2*/) { // BarrierAsyncLock is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_BarrierWait(const Execution& E, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_BarrierWait(const Execution& E, const Transition* other_transition, + const Transition* /*t2*/) { // If the other event is a barrier lock event, then we // are not reversible; otherwise we are reversible. - const auto e1_action = E.get_transition_for_handle(e1)->type_; - return e1_action != Transition::Type::BARRIER_ASYNC_LOCK; + const auto other_action = other_transition->type_; + return other_action != Transition::Type::BARRIER_ASYNC_LOCK; } -bool ReversibleRaceCalculator::is_race_reversible_CommRecv(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_CommRecv(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // CommRecv is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_CommSend(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_CommSend(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // CommSend is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_CommWait(const Execution& E, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_CommWait(const Execution& E, const Transition* other_transition, + const Transition* /*t2*/) { // If the other event is a communication event, then we // are not reversible; otherwise we are reversible. - const auto e1_action = E.get_transition_for_handle(e1)->type_; - return e1_action != Transition::Type::COMM_ASYNC_SEND && e1_action != Transition::Type::COMM_ASYNC_RECV; + const auto other_action = other_transition->type_; + return other_action != Transition::Type::COMM_ASYNC_SEND && other_action != Transition::Type::COMM_ASYNC_RECV; } -bool ReversibleRaceCalculator::is_race_reversible_CommTest(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_CommTest(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // CommTest is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_MutexAsyncLock(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_MutexAsyncLock(const Execution&, + const Transition* /*other_transition*/, + const Transition* /*t2*/) { // MutexAsyncLock is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_MutexTest(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_MutexTest(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // MutexTest is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_MutexTrylock(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_MutexTrylock(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // MutexTrylock is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_MutexUnlock(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_MutexUnlock(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // MutexUnlock is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_MutexWait(const Execution& E, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_MutexWait(const Execution& E, const Transition* /*other_transition*/, + const Transition* /*t2*/) { - // TODO: Get the semantics correct here - const auto e1_action = E.get_transition_for_handle(e1)->type_; - return e1_action != Transition::Type::MUTEX_ASYNC_LOCK && e1_action != Transition::Type::MUTEX_UNLOCK; + // TODO: for now we over approximate the reversibility + + return true; } -bool ReversibleRaceCalculator::is_race_reversible_SemAsyncLock(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_SemAsyncLock(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // SemAsyncLock is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_SemUnlock(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_SemUnlock(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // SemUnlock is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_SemWait(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_SemWait(const Execution& E, const Transition* other_transition, + const Transition* /*t2*/) { - // TODO: Get the semantics correct here - return false; + + if (other_transition->type_ == Transition::Type::SEM_UNLOCK && + static_cast(other_transition)->get_capacity() <= 1) { + return false; + } + xbt_die("SEM_WAIT that is dependent with a SEM_UNLOCK should not be reversible. FixMe"); + return true; } -bool ReversibleRaceCalculator::is_race_reversible_ObjectAccess(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_ObjectAccess(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // Object access is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_Random(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_Random(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // Random is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_TestAny(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_TestAny(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // TestAny is always enabled return true; } -bool ReversibleRaceCalculator::is_race_reversible_WaitAny(const Execution&, Execution::EventHandle e1, - const Transition* e2) +bool ReversibleRaceCalculator::is_race_reversible_WaitAny(const Execution&, const Transition* /*other_transition*/, + const Transition* /*t2*/) { // TODO: We need to check if any of the transitions // waited on occurred before `e1` - return false; + return true; // Let's overapproximate to not miss branches } } // namespace simgrid::mc::odpor