A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics in the ChangeLog
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
3295f91
..
8e872d9
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
7
. The SimGrid Team.
+/* Copyright (c) 2008-201
8
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* 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 <mc/mc.h>
#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"
#include "src/mc/mc_hash.hpp"
#include "src/mc/mc_mmu.hpp"
#include "src/mc/mc_smx.hpp"
@@
-185,13
+186,13
@@
void find_object_address(
std::vector<simgrid::xbt::VmMap> const& maps,
simgrid::mc::ObjectInformation* result)
{
std::vector<simgrid::xbt::VmMap> const& maps,
simgrid::mc::ObjectInformation* result)
{
- std::string name = simgrid::xbt::Path(result->file_name).get
Base
name();
+ 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;
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).get
Base
name();
+ std::string map_basename = simgrid::xbt::Path(maps[i].pathname).get
_base_
name();
if (map_basename != name)
continue;
if (map_basename != name)
continue;
@@
-517,8
+518,8
@@
static std::vector<s_fd_infos_t> get_current_fds(pid_t pid)
// If dot_output enabled, do not handle the corresponding file
if (dot_output != nullptr) {
// If dot_output enabled, do not handle the corresponding file
if (dot_output != nullptr) {
- std::string link_basename = simgrid::xbt::Path(link).get
Base
name();
- 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;
}
continue;
}
@@
-560,7
+561,7
@@
std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
snapshot->to_ignore = mc_model_checker->process().ignored_heap();
snapshot->to_ignore = mc_model_checker->process().ignored_heap();
- if (_sg_mc_max_visited_states > 0 ||
strcmp(_sg_mc_property_file, ""
)) {
+ 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);
snapshot->stacks = take_snapshot_stacks(snapshot.get());
if (_sg_mc_hash)
snapshot->hash = simgrid::mc::hash(*snapshot);