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
Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI
[simgrid.git]
/
src
/
mc
/
mc_snapshot.h
diff --git
a/src/mc/mc_snapshot.h
b/src/mc/mc_snapshot.h
index
1168934
..
5c638f6
100644
(file)
--- a/
src/mc/mc_snapshot.h
+++ b/
src/mc/mc_snapshot.h
@@
-15,18
+15,18
@@
#include <memory>
#include <simgrid_config.h>
#include <memory>
#include <simgrid_config.h>
-#include "
..
/xbt/mmalloc/mmprivate.h"
+#include "
src
/xbt/mmalloc/mmprivate.h"
#include <xbt/asserts.h>
#include <xbt/dynar.h>
#include <xbt/base.h>
#include <xbt/asserts.h>
#include <xbt/dynar.h>
#include <xbt/base.h>
-#include "mc_forward.hpp"
-#include "ModelChecker.hpp"
-#include "PageStore.hpp"
-#include "mc_mmalloc.h"
+#include "
src/mc/
mc_forward.hpp"
+#include "
src/mc/
ModelChecker.hpp"
+#include "
src/mc/
PageStore.hpp"
+#include "
src/mc/
mc_mmalloc.h"
#include "src/mc/AddressSpace.hpp"
#include "src/mc/AddressSpace.hpp"
-#include "mc_unw.h"
-#include "RegionSnapshot.hpp"
+#include "
src/mc/
mc_unw.h"
+#include "
src/mc/
RegionSnapshot.hpp"
SG_BEGIN_DECL()
SG_BEGIN_DECL()
@@
-155,7
+155,7
@@
public: // To be private
int privatization_index;
std::vector<std::size_t> stack_sizes;
std::vector<s_mc_snapshot_stack_t> stacks;
int privatization_index;
std::vector<std::size_t> stack_sizes;
std::vector<s_mc_snapshot_stack_t> stacks;
- std::vector<s
_mc_heap_ignore_region_t
> to_ignore;
+ std::vector<s
imgrid::mc::IgnoredHeapRegion
> to_ignore;
std::uint64_t hash;
std::vector<s_mc_snapshot_ignored_data> ignored_data;
std::vector<s_fd_infos_t> current_fds;
std::uint64_t hash;
std::vector<s_mc_snapshot_ignored_data> ignored_data;
std::vector<s_fd_infos_t> current_fds;
@@
-260,7
+260,7
@@
void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
SG_END_DECL()
XBT_PRIVATE int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
SG_END_DECL()
XBT_PRIVATE int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
- std::vector<s
_mc_heap_ignore_region_t
>* i1,
- std::vector<s
_mc_heap_ignore_region_t
>* i2);
+ std::vector<s
imgrid::mc::IgnoredHeapRegion
>* i1,
+ std::vector<s
imgrid::mc::IgnoredHeapRegion
>* i2);
#endif
#endif