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
Merge pull request #200 from Takishipp/clear_fct
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
84cdfd8
..
be90588
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-89,21
+89,21
@@
RegionSnapshot privatized_region(
{
size_t process_count = MC_smpi_process_count();
- // Read smpi_privati
s
ation_regions from MCed:
- smpi_privati
sation_region_t remote_smpi_privatis
ation_regions;
+ // Read smpi_privati
z
ation_regions from MCed:
+ smpi_privati
zation_region_t remote_smpi_privatiz
ation_regions;
mc_model_checker->process().read_variable(
- "smpi_privati
s
ation_regions",
- &remote_smpi_privati
sation_regions, sizeof(remote_smpi_privatis
ation_regions));
- s_smpi_privati
sation_region_t privatis
ation_regions[process_count];
+ "smpi_privati
z
ation_regions",
+ &remote_smpi_privati
zation_regions, sizeof(remote_smpi_privatiz
ation_regions));
+ s_smpi_privati
zation_region_t privatiz
ation_regions[process_count];
mc_model_checker->process().read_bytes(
- &privati
sation_regions, sizeof(privatis
ation_regions),
- remote(remote_smpi_privati
s
ation_regions));
+ &privati
zation_regions, sizeof(privatiz
ation_regions),
+ remote(remote_smpi_privati
z
ation_regions));
std::vector<simgrid::mc::RegionSnapshot> data;
data.reserve(process_count);
for (size_t i = 0; i < process_count; i++)
data.push_back(simgrid::mc::region(region_type, start_addr,
- privati
s
ation_regions[i].address, size));
+ privati
z
ation_regions[i].address, size));
simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot(
region_type, start_addr, permanent_addr, size);
@@
-122,7
+122,7
@@
void add_region(int index, simgrid::mc::Snapshot* snapshot,
if (type == simgrid::mc::RegionType::Data)
xbt_assert(object_info, "Missing object info for object.");
else if (type == simgrid::mc::RegionType::Heap)
- xbt_assert(
!
object_info, "Unexpected object info for heap region.");
+ xbt_assert(
not
object_info, "Unexpected object info for heap region.");
simgrid::mc::RegionSnapshot region;
#if HAVE_SMPI
@@
-142,7
+142,7
@@
void add_region(int index, simgrid::mc::Snapshot* snapshot,
return;
}
-static void get_memory_regions(simgrid::mc::
Process
* process, simgrid::mc::Snapshot* snapshot)
+static void get_memory_regions(simgrid::mc::
RemoteClient
* process, simgrid::mc::Snapshot* snapshot)
{
const size_t n = process->object_infos.size();
snapshot->snapshot_regions.resize(n + 1);
@@
-201,9
+201,7
@@
void find_object_address(
// This is the non-GNU_RELRO-part of the data segment:
if (reg.prot == PROT_RW) {
- xbt_assert(!result->start_rw,
- "Multiple read-write segments for %s, not supported",
- maps[i].pathname.c_str());
+ xbt_assert(not result->start_rw, "Multiple read-write segments for %s, not supported", maps[i].pathname.c_str());
result->start_rw = (char*) reg.start_addr;
result->end_rw = (char*) reg.end_addr;
@@
-217,8
+215,7
@@
void find_object_address(
// This is the text segment:
else if (reg.prot == PROT_RX) {
- xbt_assert(!result->start_exec,
- "Multiple executable segments for %s, not supported",
+ xbt_assert(not result->start_exec, "Multiple executable segments for %s, not supported",
maps[i].pathname.c_str());
result->start_exec = (char*) reg.start_addr;
result->end_exec = (char*) reg.end_addr;
@@
-235,9
+232,7
@@
void find_object_address(
// This is the GNU_RELRO-part of the data segment:
else if (reg.prot == PROT_READ) {
- xbt_assert(!result->start_ro,
- "Multiple read only segments for %s, not supported",
- maps[i].pathname.c_str());
+ xbt_assert(not result->start_ro, "Multiple read only segments for %s, not supported", maps[i].pathname.c_str());
result->start_ro = (char*) reg.start_addr;
result->end_ro = (char*) reg.end_addr;
}
@@
-288,15
+283,15
@@
static void fill_local_variables_values(mc_stack_frame_t stack_frame,
int process_index,
std::vector<s_local_variable>& result)
{
- simgrid::mc::
Process
* process = &mc_model_checker->process();
+ simgrid::mc::
RemoteClient
* process = &mc_model_checker->process();
- if (
!scope || !
scope->range.contain(stack_frame->ip))
+ if (
not scope || not
scope->range.contain(stack_frame->ip))
return;
for(simgrid::mc::Variable& current_variable :
scope->variables) {
- if (
!valid_variable(¤t_variable, scope, (void *)
stack_frame->ip))
+ if (
not valid_variable(¤t_variable, scope, (void*)
stack_frame->ip))
continue;
int region_type;
@@
-316,7
+311,7
@@
static void fill_local_variables_values(mc_stack_frame_t stack_frame,
if (current_variable.address != nullptr)
new_var.address = current_variable.address;
- else if (
!
current_variable.location_list.empty()) {
+ else if (
not
current_variable.location_list.empty()) {
simgrid::dwarf::Location location =
simgrid::dwarf::resolve(
current_variable.location_list,
@@
-325,7
+320,7
@@
static void fill_local_variables_values(mc_stack_frame_t stack_frame,
(void *) stack_frame->frame_base,
&mc_model_checker->process(), process_index);
- if (
!
location.in_memory())
+ if (
not
location.in_memory())
xbt_die("Cannot handle non-address variable");
new_var.address = location.address();
@@
-352,7
+347,7
@@
static std::vector<s_local_variable> get_local_variables_values(
static std::vector<s_mc_stack_frame_t> unwind_stack_frames(simgrid::mc::UnwindContext* stack_context)
{
- simgrid::mc::
Process
* process = &mc_model_checker->process();
+ simgrid::mc::
RemoteClient
* process = &mc_model_checker->process();
std::vector<s_mc_stack_frame_t> result;
unw_cursor_t c = stack_context->cursor();
@@
-408,7
+403,7
@@
static std::vector<s_mc_stack_frame_t> unwind_stack_frames(simgrid::mc::UnwindCo
}
return result;
-}
;
+}
static std::vector<s_mc_snapshot_stack_t> take_snapshot_stacks(simgrid::mc::Snapshot* snapshot)
{
@@
-444,7
+439,7
@@
static std::vector<s_mc_snapshot_stack_t> take_snapshot_stacks(simgrid::mc::Snap
static void snapshot_handle_ignore(simgrid::mc::Snapshot* snapshot)
{
xbt_assert(snapshot->process());
-
+
// Copy the memory:
for (auto const& region : mc_model_checker->process().ignored_regions()) {
s_mc_snapshot_ignored_data_t ignored_data;
@@
-515,7
+510,7
@@
static std::vector<s_fd_infos_t> get_current_fds(pid_t pid)
link[res] = '\0';
#if HAVE_SMPI
- if(smpi_is_privati
s
ation_file(link))
+ if(smpi_is_privati
z
ation_file(link))
continue;
#endif
@@
-560,7
+555,7
@@
std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
{
XBT_DEBUG("Taking snapshot %i", num_state);
- simgrid::mc::
Process
* mc_process = &mc_model_checker->process();
+ simgrid::mc::
RemoteClient
* mc_process = &mc_model_checker->process();
std::shared_ptr<simgrid::mc::Snapshot> snapshot = std::make_shared<simgrid::mc::Snapshot>(mc_process, num_state);
@@
-600,12
+595,9
@@
void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
}
#if HAVE_SMPI
- // TODO, send a message to implement this in the MCed process
if(snapshot->privatization_index >= 0) {
// Fix the privatization mmap:
- s_mc_restore_message message;
- message.type = MC_MESSAGE_RESTORE;
- message.index = snapshot->privatization_index;
+ s_mc_message_restore message{MC_MESSAGE_RESTORE, snapshot->privatization_index};
mc_model_checker->process().getChannel().send(message);
}
#endif
@@
-617,15
+609,14
@@
void restore_snapshot_fds(simgrid::mc::Snapshot* snapshot)
xbt_die("FD snapshot not implemented in client/server mode.");
for (auto const& fd : snapshot->current_fds) {
-
+
int new_fd = open(fd.filename.c_str(), fd.flags);
if (new_fd < 0)
- xbt_die("Could not reopen the file %s fo restoring the file descriptor",
- fd.filename.c_str());
+ xbt_die("Could not reopen the file %s fo restoring the file descriptor", fd.filename.c_str());
if (new_fd != fd.number) {
dup2(new_fd, fd.number);
close(new_fd);
- }
;
+ }
lseek(fd.number, fd.current_position, SEEK_SET);
}
}