X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ebc53f4ea63c0ec84680e5484ad9c9a81c85ff3..bf0369b7c016a1b27d925dae347cab5d3f2d776b:/src/mc/mc_global.cpp?ds=sidebyside

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 9b8ce3c1b4..b9a76cca01 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -1,49 +1,33 @@
-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-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 <cinttypes>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-
-#include <cxxabi.h>
-
-#include <vector>
-
-#include "xbt/automaton.h"
-#include "xbt/backtrace.hpp"
-#include "xbt/dynar.h"
-
-#include "mc_base.h"
-
 #include "mc/mc.h"
-
-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#endif
-
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 
 #if SIMGRID_HAVE_MC
+#include "src/mc/Session.hpp"
 #include "src/mc/checker/Checker.hpp"
+#include "src/mc/inspect/mc_unw.hpp"
 #include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_safety.hpp"
 #include "src/mc/mc_smx.hpp"
-#include "src/mc/mc_snapshot.hpp"
-#include "src/mc/mc_unw.hpp"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/sosp/Snapshot.hpp"
+#include "xbt/backtrace.hpp"
+
 #include <libunwind.h>
 #endif
 
-#include "src/mc/Transition.hpp"
-#include "src/mc/mc_record.hpp"
-#include "src/mc/remote/Client.hpp"
-#include "src/mc/remote/mc_protocol.h"
+#ifndef _WIN32
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
 
@@ -96,8 +80,7 @@ void MC_run()
   simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
   MC_ignore_heap(simgrid::mc::processes_time.data(),
     simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
-  simgrid::mc::Client::get()->mainLoop();
-  simgrid::mc::processes_time.clear();
+  simgrid::mc::Client::get()->main_loop();
 }
 
 void MC_show_deadlock()
@@ -106,9 +89,10 @@ void MC_show_deadlock()
   XBT_INFO("*** DEAD-LOCK DETECTED ***");
   XBT_INFO("**************************");
   XBT_INFO("Counter-example execution trace:");
-  for (auto const& s : mc_model_checker->getChecker()->getTextualTrace())
-    XBT_INFO("%s", s.c_str());
-  simgrid::mc::session->logState();
+  for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
+    XBT_INFO("  %s", s.c_str());
+  simgrid::mc::dumpRecordPath();
+  simgrid::mc::session->log_state();
 }
 
 void MC_automaton_load(const char *file)
@@ -122,7 +106,7 @@ void MC_automaton_load(const char *file)
 namespace simgrid {
 namespace mc {
 
-void dumpStack(FILE* file, unw_cursor_t cursor)
+void dumpStack(FILE* file, unw_cursor_t&& cursor)
 {
   int nframe = 0;
   char buffer[100];
@@ -165,7 +149,7 @@ static void MC_dump_stacks(FILE* file)
     context.initialize(&mc_model_checker->process(), &raw_context);
 
     unw_cursor_t cursor = context.cursor();
-    simgrid::mc::dumpStack(file, cursor);
+    simgrid::mc::dumpStack(file, std::move(cursor));
   }
 }
 #endif
@@ -175,11 +159,11 @@ double MC_process_clock_get(smx_actor_t process)
   if (simgrid::mc::processes_time.empty())
     return 0;
   if (process != nullptr)
-    return simgrid::mc::processes_time[process->pid_];
+    return simgrid::mc::processes_time[process->get_pid()];
   return -1;
 }
 
 void MC_process_clock_add(smx_actor_t process, double amount)
 {
-  simgrid::mc::processes_time[process->pid_] += amount;
+  simgrid::mc::processes_time[process->get_pid()] += amount;
 }