X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82230d737404aa70c3c2b5824d97109f1f129d58..6812a09d4989db854967f0d7ff81a5e06d89e868:/src/mc/mc_global.cpp

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index b14329839c..944de529aa 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -1,55 +1,36 @@
-/* Copyright (c) 2008-2017. 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 "xbt/swag.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)");
 
-extern std::string _sg_mc_dot_output_file;
-
 namespace simgrid {
 namespace mc {
 
@@ -79,7 +60,7 @@ FILE *dot_output = nullptr;
 
 void MC_init_dot_output()
 {
-  dot_output = fopen(_sg_mc_dot_output_file.c_str(), "w");
+  dot_output = fopen(_sg_mc_dot_output_file.get().c_str(), "w");
 
   if (dot_output == nullptr) {
     perror("Error open dot output file");
@@ -99,12 +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]));
-  for (auto const& kv : simix_global->process_list) {
-    smx_actor_t actor = kv.second;
-    MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
-  }
-  simgrid::mc::Client::get()->mainLoop();
-  simgrid::mc::processes_time.clear();
+  simgrid::mc::Client::get()->main_loop();
 }
 
 void MC_show_deadlock()
@@ -113,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)
@@ -129,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];
@@ -157,24 +134,6 @@ void dumpStack(FILE* file, unw_cursor_t cursor)
 
 }
 }
-
-static void MC_dump_stacks(FILE* file)
-{
-  int nstack = 0;
-  for (auto const& stack : mc_model_checker->process().stack_areas()) {
-    fprintf(file, "Stack %i:\n", nstack);
-    nstack++;
-
-    simgrid::mc::UnwindContext context;
-    unw_context_t raw_context =
-      (unw_context_t) mc_model_checker->process().read<unw_context_t>(
-        simgrid::mc::remote((unw_context_t *)stack.context));
-    context.initialize(&mc_model_checker->process(), &raw_context);
-
-    unw_cursor_t cursor = context.cursor();
-    simgrid::mc::dumpStack(file, cursor);
-  }
-}
 #endif
 
 double MC_process_clock_get(smx_actor_t process)
@@ -182,11 +141,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;
 }