-/* Copyright (c) 2015. The SimGrid Team.
+/* Copyright (c) 2015-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "simgrid/sg_config.h"
#include "src/xbt_modinter.h"
-#include "src/mc/mc_base.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_exit.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_exit.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_safety.hpp"
+#include "src/mc/remote/mc_protocol.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
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 || _sg_mc_property_file[0] == '\0')
+ else if (_sg_mc_property_file == nullptr || _sg_mc_property_file[0] == '\0')
return std::unique_ptr<simgrid::mc::Checker>(
simgrid::mc::createSafetyChecker(session));
else
int main(int argc, char** argv)
{
using simgrid::mc::Session;
+ XBT_LOG_CONNECT(mc_main);
try {
if (argc < 2)
simgrid::mc::session = session.get();
std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
- int res = checker->run();
+ int res = SIMGRID_MC_EXIT_SUCCESS;
+ try {
+ checker->run();
+ } catch (simgrid::mc::DeadlockError& de) {
+ res = SIMGRID_MC_EXIT_DEADLOCK;
+ } catch (simgrid::mc::TerminationError& te) {
+ res = SIMGRID_MC_EXIT_NON_TERMINATION;
+ } catch (simgrid::mc::LivenessError& le) {
+ res = SIMGRID_MC_EXIT_LIVENESS;
+ }
checker = nullptr;
session->close();
return res;