further tidy the includes in MC

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

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 7f3d39a..0a713b8 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -1,35 +1,19 @@
-/* Copyright (c) 2015-2018. The SimGrid Team.
+/* Copyright (c) 2015-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <exception>
-
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-
-#include <utility>
-
-#include <unistd.h>
-
-#include <xbt/log.h>
-
 #include "simgrid/sg_config.hpp"
-#include "src/xbt_modinter.h"
-
 #include "src/mc/Session.hpp"
 #include "src/mc/checker/Checker.hpp"
-#include "src/mc/mc_base.h"
-#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
-#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_safety.hpp"
-#include "src/mc/remote/mc_protocol.h"
+
+#include <cstring>
+#include <memory>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
-extern std::string _sg_mc_property_file;
 
 static inline
 char** argvdup(int argc, char** argv)
@@ -44,7 +28,7 @@ static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session&
 {
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createCommunicationDeterminismChecker(session));
-  else if (_sg_mc_property_file.empty())
+  else if (_sg_mc_property_file.get().empty())
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createSafetyChecker(session));
   else
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createLivenessChecker(session));
@@ -77,11 +61,11 @@ int main(int argc, char** argv)
     int res = SIMGRID_MC_EXIT_SUCCESS;
     try {
       checker->run();
-    } catch (simgrid::mc::DeadlockError& de) {
+    } catch (const simgrid::mc::DeadlockError&) {
       res = SIMGRID_MC_EXIT_DEADLOCK;
-    } catch (simgrid::mc::TerminationError& te) {
+    } catch (const simgrid::mc::TerminationError&) {
       res = SIMGRID_MC_EXIT_NON_TERMINATION;
-    } catch (simgrid::mc::LivenessError& le) {
+    } catch (const simgrid::mc::LivenessError&) {
       res = SIMGRID_MC_EXIT_LIVENESS;
     }
     checker = nullptr;