[mc] Remove FunctionalChecker

[simgrid.git] / src / mc / simgrid_mc.cpp

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index ac45108..719087f 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -28,6 +28,7 @@
 #include "src/mc/mc_exit.h"
 #include "src/mc/Session.hpp"
 #include "src/mc/Checker.hpp"
+#include "src/mc/CommunicationDeterminismChecker.hpp"
 #include "src/mc/SafetyChecker.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
@@ -44,22 +45,15 @@ char** argvdup(int argc, char** argv)
 static
 std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
 {
-  using simgrid::mc::Session;
-  using simgrid::mc::FunctionalChecker;
-
-  std::function<int(Session& session)> code;
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-    code = [](Session& session) {
-      return MC_modelcheck_comm_determinism(); };
+    return std::unique_ptr<simgrid::mc::Checker>(
+      new simgrid::mc::CommunicationDeterminismChecker(session));
   else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
     return std::unique_ptr<simgrid::mc::Checker>(
       new simgrid::mc::SafetyChecker(session));
   else
     return std::unique_ptr<simgrid::mc::Checker>(
       new simgrid::mc::LivenessChecker(session));
-
-  return std::unique_ptr<simgrid::mc::Checker>(
-    new FunctionalChecker(session, std::move(code)));
 }
 
 int main(int argc, char** argv)