Merge branch 'master' of framagit.org:simgrid/simgrid

diff --cc src/mc/explo/odpor/ReversibleRaceCalculator.cpp
index d35c167,5fcb30e..575d8e0
--- 1/src/mc/explo/odpor/ReversibleRaceCalculator.cpp
--- 2/src/mc/explo/odpor/ReversibleRaceCalculator.cpp
+++ b/src/mc/explo/odpor/ReversibleRaceCalculator.cpp
@@@ -153,16 -150,17 +153,17 @@@ bool ReversibleRaceCalculator::is_race_
    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: for now we over approximate the reversibility
- 
-   return true;
+   // Only an Unlock can be dependent with a Wait
+   // and in this case, the Unlock enbaled the wait
+   // Not reversibled
+   return false;
  }
  
 -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;