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
remove the last include of private header from installed headers
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
d5a334f
..
9c531b3
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-18,6
+18,7
@@
#include "src/internal_config.h"
#include "src/mc/mc_private.hpp"
#include "src/smpi/include/private.hpp"
#include "src/internal_config.h"
#include "src/mc/mc_private.hpp"
#include "src/smpi/include/private.hpp"
+#include "xbt/file.hpp"
#include "xbt/mmalloc.h"
#include "xbt/module.h"
#include "xbt/mmalloc.h"
#include "xbt/module.h"
@@
-47,6
+48,12
@@
using simgrid::mc::remote;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint");
+#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 {
namespace simgrid {
namespace mc {
@@
-60,11
+67,6
@@
namespace mc {
static void restore(mc_mem_region_t region)
{
switch(region->storage_type()) {
static void restore(mc_mem_region_t region)
{
switch(region->storage_type()) {
- case simgrid::mc::StorageType::NoData:
- default:
- xbt_die("Storage type not supported");
- break;
-
case simgrid::mc::StorageType::Flat:
mc_model_checker->process().write_bytes(region->flat_data().get(),
region->size(), region->permanent_address());
case simgrid::mc::StorageType::Flat:
mc_model_checker->process().write_bytes(region->flat_data().get(),
region->size(), region->permanent_address());
@@
-78,6
+80,10
@@
static void restore(mc_mem_region_t region)
for (auto& p : region->privatized_data())
restore(&p);
break;
for (auto& p : region->privatized_data())
restore(&p);
break;
+
+ default: // includes StorageType::NoData
+ xbt_die("Storage type not supported");
+ break;
}
}
}
}
@@
-139,7
+145,6
@@
void add_region(int index, simgrid::mc::Snapshot* snapshot,
snapshot->snapshot_regions[index]
= std::unique_ptr<simgrid::mc::RegionSnapshot>(
new simgrid::mc::RegionSnapshot(std::move(region)));
snapshot->snapshot_regions[index]
= std::unique_ptr<simgrid::mc::RegionSnapshot>(
new simgrid::mc::RegionSnapshot(std::move(region)));
- return;
}
static void get_memory_regions(simgrid::mc::RemoteClient* process, simgrid::mc::Snapshot* snapshot)
}
static void get_memory_regions(simgrid::mc::RemoteClient* process, simgrid::mc::Snapshot* snapshot)
@@
-175,10
+180,6
@@
static void get_memory_regions(simgrid::mc::RemoteClient* process, simgrid::mc::
snapshot->privatization_index = simgrid::mc::ProcessIndexMissing;
}
snapshot->privatization_index = simgrid::mc::ProcessIndexMissing;
}
-#define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC)
-#define PROT_RW (PROT_READ | PROT_WRITE)
-#define PROT_RX (PROT_READ | PROT_EXEC)
-
/** \brief Fills the position of the segments (executable, read-only, read/write).
* */
// TODO, use the ELF segment information for more robustness
/** \brief Fills the position of the segments (executable, read-only, read/write).
* */
// TODO, use the ELF segment information for more robustness
@@
-186,18
+187,15
@@
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)
{
-
char* name = xbt_basename(result->file_name.c_str()
);
+
std::string name = simgrid::xbt::Path(result->file_name).getBasename(
);
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;
- char* map_basename = xbt_basename(maps[i].pathname.c_str());
- if (strcmp(name, map_basename) != 0) {
- free(map_basename);
+ std::string map_basename = simgrid::xbt::Path(maps[i].pathname).getBasename();
+ if (map_basename != name)
continue;
continue;
- }
- free(map_basename);
// This is the non-GNU_RELRO-part of the data segment:
if (reg.prot == PROT_RW) {
// This is the non-GNU_RELRO-part of the data segment:
if (reg.prot == PROT_RW) {
@@
-251,8
+249,6
@@
void find_object_address(
result->end = result->end_exec;
xbt_assert(result->start_exec || result->start_rw || result->start_ro);
result->end = result->end_exec;
xbt_assert(result->start_exec || result->start_rw || result->start_ro);
-
- free(name);
}
/************************************* Take Snapshot ************************************/
}
/************************************* Take Snapshot ************************************/
@@
-278,10
+274,8
@@
static bool valid_variable(simgrid::mc::Variable* var,
return true;
}
return true;
}
-static void fill_local_variables_values(mc_stack_frame_t stack_frame,
- simgrid::mc::Frame* scope,
- int process_index,
- std::vector<s_local_variable>& result)
+static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::mc::Frame* scope, int process_index,
+ std::vector<s_local_variable_t>& result)
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
@@
-335,10
+329,10
@@
static void fill_local_variables_values(mc_stack_frame_t stack_frame,
stack_frame, &nested_scope, process_index, result);
}
stack_frame, &nested_scope, process_index, result);
}
-static std::vector<s_local_variable
> get_local_variables_values(
-
std::vector<s_mc_stack_frame_t>& stack_frames,
int process_index)
+static std::vector<s_local_variable
_t> get_local_variables_values(std::vector<s_mc_stack_frame_t>& stack_frames,
+
int process_index)
{
{
- std::vector<s_local_variable> variables;
+ std::vector<s_local_variable
_t
> variables;
for (s_mc_stack_frame_t& stack_frame : stack_frames)
fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables);
return variables;
for (s_mc_stack_frame_t& stack_frame : stack_frames)
fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables);
return variables;
@@
-525,12
+519,9
@@
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) {
- char* link_basename = xbt_basename(link);
- if (strcmp(link_basename, _sg_mc_dot_output_file) == 0) {
- free(link_basename);
+ std::string link_basename = simgrid::xbt::Path(link).getBasename();
+ if (link_basename == _sg_mc_dot_output_file)
continue;
continue;
- }
- free(link_basename);
}
// This is probably a shared memory used by lttng-ust:
}
// This is probably a shared memory used by lttng-ust:
@@
-571,7
+562,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.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);
@@
-596,7
+587,7
@@
void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
#if HAVE_SMPI
if(snapshot->privatization_index >= 0) {
// Fix the privatization mmap:
#if HAVE_SMPI
if(snapshot->privatization_index >= 0) {
// Fix the privatization mmap:
- s_mc_message_restore message{MC_MESSAGE_RESTORE, snapshot->privatization_index};
+ s_mc_message_restore
_t
message{MC_MESSAGE_RESTORE, snapshot->privatization_index};
mc_model_checker->process().getChannel().send(message);
}
#endif
mc_model_checker->process().getChannel().send(message);
}
#endif