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

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index b14329839c..f85660aa71 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -15,7 +15,6 @@
 #include "xbt/automaton.h"
 #include "xbt/backtrace.hpp"
 #include "xbt/dynar.h"
-#include "xbt/swag.h"
 
 #include "mc_base.h"
 
@@ -36,8 +35,8 @@
 #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/sosp/mc_snapshot.hpp"
 #include <libunwind.h>
 #endif
 
@@ -48,8 +47,6 @@
 
 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 +76,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,10 +96,6 @@ 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();
 }
@@ -182,11 +175,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;
 }