-/* 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
#include "src/mc/mc_private.hpp"
#include <mc/mc.h>
+#include "src/mc/mc_config.hpp"
#include "src/mc/mc_hash.hpp"
#include "src/mc/mc_mmu.hpp"
#include "src/mc/mc_smx.hpp"
#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 {
std::vector<simgrid::xbt::VmMap> const& maps,
simgrid::mc::ObjectInformation* result)
{
- std::string name = simgrid::xbt::Path(result->file_name).getBasename();
+ std::string name = simgrid::xbt::Path(result->file_name).get_base_name();
for (size_t i = 0; i < maps.size(); ++i) {
simgrid::xbt::VmMap const& reg = maps[i];
if (maps[i].pathname.empty())
continue;
- std::string map_basename = simgrid::xbt::Path(maps[i].pathname).getBasename();
+ std::string map_basename = simgrid::xbt::Path(maps[i].pathname).get_base_name();
if (map_basename != name)
continue;
// 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)
+ std::string link_basename = simgrid::xbt::Path(link).get_base_name();
+ if (link_basename == _sg_mc_dot_output_file.get())
continue;
}
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);