X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..b0ac1d5d6e14550c3d3abbe50a9105513aa5a263:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 9c531b373d..bd1a8d719a 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. +/* Copyright (c) 2008-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -32,6 +32,7 @@ #include "src/mc/mc_private.hpp" #include +#include "src/mc/mc_config.hpp" #include "src/mc/mc_hash.hpp" #include "src/mc/mc_mmu.hpp" #include "src/mc/mc_smx.hpp" @@ -51,8 +52,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_check #define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC) #define PROT_RW (PROT_READ | PROT_WRITE) #define PROT_RX (PROT_READ | PROT_EXEC) -extern std::string _sg_mc_property_file; -extern std::string _sg_mc_dot_output_file; namespace simgrid { namespace mc { @@ -520,7 +519,7 @@ static std::vector get_current_fds(pid_t pid) // If dot_output enabled, do not handle the corresponding file if (dot_output != nullptr) { std::string link_basename = simgrid::xbt::Path(link).getBasename(); - if (link_basename == _sg_mc_dot_output_file) + if (link_basename == _sg_mc_dot_output_file.get()) continue; } @@ -562,7 +561,7 @@ std::shared_ptr take_snapshot(int num_state) snapshot->to_ignore = mc_model_checker->process().ignored_heap(); - if (_sg_mc_max_visited_states > 0 || not _sg_mc_property_file.empty()) { + if (_sg_mc_max_visited_states > 0 || not _sg_mc_property_file.get().empty()) { snapshot->stacks = take_snapshot_stacks(snapshot.get()); if (_sg_mc_hash) snapshot->hash = simgrid::mc::hash(*snapshot);