X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff4bc56d5d0d4b1bf3e5c83e5af51ac3cc119789..eb115a05127cacf97d96dca1107ebfe60653e4bd:/src/mc/explo/odpor/ReversibleRaceCalculator.cpp diff --git a/src/mc/explo/odpor/ReversibleRaceCalculator.cpp b/src/mc/explo/odpor/ReversibleRaceCalculator.cpp index f6007c27ff..9b8f6144f0 100644 --- a/src/mc/explo/odpor/ReversibleRaceCalculator.cpp +++ b/src/mc/explo/odpor/ReversibleRaceCalculator.cpp @@ -5,6 +5,8 @@ #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 @@ -174,15 +176,15 @@ bool ReversibleRaceCalculator::is_race_reversible_SemUnlock(const Execution&, Ex return true; } -bool ReversibleRaceCalculator::is_race_reversible_SemWait(const Execution&, Execution::EventHandle /*e1*/, +bool ReversibleRaceCalculator::is_race_reversible_SemWait(const Execution& E, Execution::EventHandle e1, const Transition* /*e2*/) { - // TODO: Get the semantics correct here - // Certainement qu'il suffit de considérer les SemUnlock. ⋀ a priori, - // il doit même suffir de considérer le cas où leur capacity après execution est <=1 - // ces cas disent qu'avant éxecution la capacity était de 0. Donc aucune chance de pouvoir - // wait avant le unlock. - return false; + // Reversible with everynbody but unlock which creates a free token + const auto e1_transition = E.get_transition_for_handle(e1); + if (e1_transition->type_ == Transition::Type::SEM_UNLOCK && + static_cast(e1_transition)->get_capacity() <= 1) + return false; + return true; } bool ReversibleRaceCalculator::is_race_reversible_ObjectAccess(const Execution&, Execution::EventHandle /*e1*/,