Merge branch 'tracemgrsplit' into 'master'

[simgrid.git] / src / mc / Session.cpp

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 96f377a..faaf181 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -80,12 +80,12 @@ pid_t do_fork(F code)
 Session::Session(pid_t pid, int socket)
 {
   std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(pid, socket));
+
 #if HAVE_SMPI
-  // TODO, automatic detection of the config from the process
-  process->privatized(smpi_privatize_global_variables != SmpiPrivStrategies::NONE);
-#else
-  process->privatized(false);
+  xbt_assert(smpi_privatize_global_variables != SmpiPrivStrategies::MMAP,
+             "Please use the dlopen privatization schema when model-checking SMPI code");
 #endif
+
   model_checker_.reset(new simgrid::mc::ModelChecker(std::move(process)));
   xbt_assert(mc_model_checker == nullptr);
   mc_model_checker = model_checker_.get();
@@ -117,7 +117,7 @@ void Session::restore_initial_state()
 
 void Session::log_state()
 {
-  mc_model_checker->getChecker()->logState();
+  mc_model_checker->getChecker()->log_state();
 
   if (not _sg_mc_dot_output_file.get().empty()) {
     fprintf(dot_output, "}\n");