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
plug leaks
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
f05cfcd
..
daf52a4
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
5
. The SimGrid Team.
+/* Copyright (c) 2008-201
7
. 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
@@
-6,10
+6,10
@@
#include <unistd.h>
#include <unistd.h>
+#include <cstring>
+#include <dirent.h>
#include <fcntl.h>
#include <fcntl.h>
-#include <string.h>
#include <link.h>
#include <link.h>
-#include <dirent.h>
#ifndef WIN32
#include <sys/mman.h>
#ifndef WIN32
#include <sys/mman.h>
@@
-17,7
+17,7
@@
#include "src/internal_config.h"
#include "src/mc/mc_private.h"
#include "src/internal_config.h"
#include "src/mc/mc_private.h"
-#include "src/smpi/private.h"
+#include "src/smpi/
include/
private.h"
#include "xbt/mmalloc.h"
#include "xbt/module.h"
#include "xbt/mmalloc.h"
#include "xbt/module.h"
@@
-142,7
+142,7
@@
void add_region(int index, simgrid::mc::Snapshot* snapshot,
return;
}
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);
{
const size_t n = process->object_infos.size();
snapshot->snapshot_regions.resize(n + 1);
@@
-283,7
+283,7
@@
static void fill_local_variables_values(mc_stack_frame_t stack_frame,
int process_index,
std::vector<s_local_variable>& result)
{
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 (not scope || not scope->range.contain(stack_frame->ip))
return;
if (not scope || not scope->range.contain(stack_frame->ip))
return;
@@
-347,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)
{
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();
std::vector<s_mc_stack_frame_t> result;
unw_cursor_t c = stack_context->cursor();
@@
-555,7
+555,7
@@
std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
{
XBT_DEBUG("Taking snapshot %i", 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);
std::shared_ptr<simgrid::mc::Snapshot> snapshot = std::make_shared<simgrid::mc::Snapshot>(mc_process, num_state);
@@
-595,12
+595,9
@@
void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
}
#if HAVE_SMPI
}
#if HAVE_SMPI
- // TODO, send a message to implement this in the MCed process
if(snapshot->privatization_index >= 0) {
// Fix the privatization mmap:
if(snapshot->privatization_index >= 0) {
// Fix the privatization mmap:
- s_mc_message_restore 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
mc_model_checker->process().getChannel().send(message);
}
#endif