X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2dde43678c66f9593c2a2151f0f6e7c85d3b079..2ef958bf49890e4ac8fbe179f1d339b923fb67a8:/src/mc/explo/odpor/ReversibleRaceCalculator.hpp

diff --git a/src/mc/explo/odpor/ReversibleRaceCalculator.hpp b/src/mc/explo/odpor/ReversibleRaceCalculator.hpp
index 5135bd2843..1c6781482a 100644
--- a/src/mc/explo/odpor/ReversibleRaceCalculator.hpp
+++ b/src/mc/explo/odpor/ReversibleRaceCalculator.hpp
@@ -9,7 +9,7 @@
 #include "src/mc/explo/odpor/Execution.hpp"
 #include "src/mc/explo/odpor/odpor_forward.hpp"
 #include "src/mc/transition/Transition.hpp"
-#include "src/mc/transition/TransitionActorJoin.hpp"
+#include "src/mc/transition/TransitionActor.hpp"
 #include "src/mc/transition/TransitionAny.hpp"
 #include "src/mc/transition/TransitionComm.hpp"
 #include "src/mc/transition/TransitionObjectAccess.hpp"
@@ -29,26 +29,26 @@ namespace simgrid::mc::odpor {
  * execution; indeed, the question the method answers
  * is only sensible in the context of a race
  */
-struct ReversibleRaceCalculator final {
-  static bool is_race_reversible_ActorJoin(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_BarrierAsyncLock(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_BarrierWait(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_CommRecv(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_CommSend(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_CommWait(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_CommTest(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_MutexAsyncLock(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_MutexTest(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_MutexTrylock(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_MutexUnlock(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_MutexWait(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_SemAsyncLock(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_SemUnlock(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_SemWait(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_ObjectAccess(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_Random(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_TestAny(const Execution&, Execution::EventHandle e1, const Transition* e2);
-  static bool is_race_reversible_WaitAny(const Execution&, Execution::EventHandle e1, const Transition* e2);
+class ReversibleRaceCalculator final {
+  static bool is_race_reversible_ActorJoin(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_BarrierAsyncLock(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_BarrierWait(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_CommRecv(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_CommSend(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_CommWait(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_CommTest(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_MutexAsyncLock(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_MutexTest(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_MutexTrylock(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_MutexUnlock(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_MutexWait(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_SemAsyncLock(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_SemUnlock(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_SemWait(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_ObjectAccess(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_Random(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_TestAny(const Execution&, const Transition* t1, const Transition* t2);
+  static bool is_race_reversible_WaitAny(const Execution&, const Transition* t1, const Transition* t2);
 
 public:
   static bool is_race_reversible(const Execution&, Execution::EventHandle e1, Execution::EventHandle e2);