move the checker algorithms to their own directory

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index a8ee6bc..dc4dba8 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -30,7 +30,7 @@
 #include "src/mc/mc_exit.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/Transition.hpp"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
 

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 260edd4..8eca37c 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -18,7 +18,7 @@
 #include "src/mc/Session.hpp"
 #include "src/mc/mc_state.h"
 #include "src/mc/mc_private.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
 

diff --git a/src/mc/Checker.cpp b/src/mc/checker/Checker.cpp
similarity index 95%
rename from src/mc/Checker.cpp
rename to src/mc/checker/Checker.cpp
index 6ae0aae..a685913 100644 (file)
--- a/src/mc/Checker.cpp
+++ b/src/mc/checker/Checker.cpp
@@ -8,7 +8,7 @@
 
 #include <xbt/asserts.h>
 
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #include "src/mc/ModelChecker.hpp"
 
 namespace simgrid {

diff --git a/src/mc/Checker.hpp b/src/mc/checker/Checker.hpp
similarity index 100%
rename from src/mc/Checker.hpp
rename to src/mc/checker/Checker.hpp

diff --git a/src/mc/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
similarity index 99%
rename from src/mc/CommunicationDeterminismChecker.cpp
rename to src/mc/checker/CommunicationDeterminismChecker.cpp
index 2449b6c..864566c 100644 (file)
--- a/src/mc/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -19,7 +19,7 @@
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/Client.hpp"
-#include "src/mc/CommunicationDeterminismChecker.hpp"
+#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
 #include "src/mc/mc_exit.h"
 #include "src/mc/VisitedState.hpp"
 #include "src/mc/Transition.hpp"

diff --git a/src/mc/CommunicationDeterminismChecker.hpp b/src/mc/checker/CommunicationDeterminismChecker.hpp
similarity index 97%
rename from src/mc/CommunicationDeterminismChecker.hpp
rename to src/mc/checker/CommunicationDeterminismChecker.hpp
index 9cfea26..6b85fb2 100644 (file)
--- a/src/mc/CommunicationDeterminismChecker.hpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.hpp
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "src/mc/mc_forward.hpp"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #include "src/mc/VisitedState.hpp"
 
 #ifndef SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP

diff --git a/src/mc/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp
similarity index 99%
rename from src/mc/LivenessChecker.cpp
rename to src/mc/checker/LivenessChecker.cpp
index 529e8ec..fc2ecb1 100644 (file)
--- a/src/mc/LivenessChecker.cpp
+++ b/src/mc/checker/LivenessChecker.cpp
@@ -21,7 +21,7 @@
 #include <xbt/sysdep.h>
 
 #include "src/mc/mc_request.h"
-#include "src/mc/LivenessChecker.hpp"
+#include "src/mc/checker/LivenessChecker.hpp"
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/mc_smx.h"

diff --git a/src/mc/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp
similarity index 98%
rename from src/mc/LivenessChecker.hpp
rename to src/mc/checker/LivenessChecker.hpp
index 751dacc..ab8a94a 100644 (file)
--- a/src/mc/LivenessChecker.hpp
+++ b/src/mc/checker/LivenessChecker.hpp
@@ -19,7 +19,7 @@
 #include <xbt/automaton.h>
 #include <xbt/memory.hpp>
 #include "src/mc/mc_state.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 
 SG_BEGIN_DECL()
 

diff --git a/src/mc/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp
similarity index 99%
rename from src/mc/SafetyChecker.cpp
rename to src/mc/checker/SafetyChecker.cpp
index dcd4059..68e667f 100644 (file)
--- a/src/mc/SafetyChecker.cpp
+++ b/src/mc/checker/SafetyChecker.cpp
@@ -22,8 +22,7 @@
 #include "src/mc/mc_smx.h"
 #include "src/mc/Client.hpp"
 #include "src/mc/mc_exit.h"
-#include "src/mc/Checker.hpp"
-#include "src/mc/SafetyChecker.hpp"
+#include "src/mc/checker/SafetyChecker.hpp"
 #include "src/mc/VisitedState.hpp"
 #include "src/mc/Transition.hpp"
 #include "src/mc/Session.hpp"

diff --git a/src/mc/SafetyChecker.hpp b/src/mc/checker/SafetyChecker.hpp
similarity index 97%
rename from src/mc/SafetyChecker.hpp
rename to src/mc/checker/SafetyChecker.hpp
index 11dfcd0..e628c92 100644 (file)
--- a/src/mc/SafetyChecker.hpp
+++ b/src/mc/checker/SafetyChecker.hpp
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "src/mc/mc_forward.hpp"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #include "src/mc/VisitedState.hpp"
 
 namespace simgrid {

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
similarity index 98%
rename from src/mc/simgrid_mc.cpp
rename to src/mc/checker/simgrid_mc.cpp
index ec20889..1b0c120 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -26,7 +26,7 @@
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_exit.h"
 #include "src/mc/Session.hpp"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
 

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index a2b49fe..e0f5904 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -13,8 +13,7 @@
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_smx.h"
 #include "src/mc/mc_xbt.hpp"
-#include "src/mc/Checker.hpp"
-#include "src/mc/CommunicationDeterminismChecker.hpp"
+#include "src/mc/checker/CommunicationDeterminismChecker.hpp"
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index c4b23fe..1adc80b 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -38,7 +38,7 @@
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_unw.h"
 #include "src/mc/mc_smx.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #endif
 
 #include "src/mc/mc_record.h"

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 8fff9d0..d2c382c 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -31,7 +31,7 @@
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_state.h"
 #include "src/mc/mc_smx.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1e3d6be..769d19c 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -548,17 +548,21 @@ set(MC_SRC_BASE
   )
 
 set(MC_SRC
+  src/mc/checker/Checker.cpp
+  src/mc/checker/Checker.hpp
+  src/mc/checker/CommunicationDeterminismChecker.cpp
+  src/mc/checker/CommunicationDeterminismChecker.hpp
+  src/mc/checker/SafetyChecker.cpp
+  src/mc/checker/SafetyChecker.hpp
+  src/mc/checker/LivenessChecker.cpp
+  src/mc/checker/LivenessChecker.hpp
   src/mc/RemotePtr.hpp
   src/mc/AddressSpace.hpp
   src/mc/AddressSpace.cpp
   src/mc/Channel.cpp
   src/mc/Channel.hpp
-  src/mc/Checker.cpp
-  src/mc/Checker.hpp
   src/mc/Client.cpp
   src/mc/Client.hpp
-  src/mc/CommunicationDeterminismChecker.cpp
-  src/mc/CommunicationDeterminismChecker.hpp
   src/mc/Frame.hpp
   src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
@@ -567,8 +571,6 @@ set(MC_SRC
   src/mc/ObjectInformation.cpp
   src/mc/PageStore.hpp
   src/mc/PageStore.cpp
-  src/mc/SafetyChecker.cpp
-  src/mc/SafetyChecker.hpp
   src/mc/ChunkedData.hpp
   src/mc/ChunkedData.cpp
   src/mc/RegionSnapshot.cpp
@@ -601,10 +603,8 @@ set(MC_SRC
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.h
   src/mc/mc_mmalloc.h
-  src/mc/LivenessChecker.hpp
   src/mc/LocationList.hpp
   src/mc/LocationList.cpp
-  src/mc/LivenessChecker.cpp
   src/mc/mc_record.cpp
   src/mc/mc_member.cpp
   src/mc/mc_memory.cpp
@@ -627,7 +627,7 @@ set(MC_SRC
   src/mc/Transition.hpp
   )
 
-set(MC_SIMGRID_MC_SRC  src/mc/simgrid_mc.cpp)
+set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
   include/msg/msg.h