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
[mc] Do not use reduction_mode outside of the safety algorithm
[simgrid.git]
/
src
/
mc
/
RegionSnapshot.cpp
diff --git
a/src/mc/RegionSnapshot.cpp
b/src/mc/RegionSnapshot.cpp
index a045b2f8ec11e33cc17149e76b1e141cade01565..fc74d88e8d3f7c11029572f2e34d972539f377d2 100644
(file)
--- a/
src/mc/RegionSnapshot.cpp
+++ b/
src/mc/RegionSnapshot.cpp
@@
-14,13
+14,9
@@
#include "src/mc/ChunkedData.hpp"
#include "src/mc/RegionSnapshot.hpp"
#include "src/mc/ChunkedData.hpp"
#include "src/mc/RegionSnapshot.hpp"
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc,
"Logging specific to region snapshots");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc,
"Logging specific to region snapshots");
-}
-
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-39,14
+35,14
@@
const char* to_cstr(RegionType region)
}
}
}
}
-
buffer::b
uffer(std::size_t size, Type type) : size_(size), type_(type)
+
Buffer::B
uffer(std::size_t size, Type type) : size_(size), type_(type)
{
switch(type_) {
case Type::Malloc:
{
switch(type_) {
case Type::Malloc:
- data_ = malloc(size_);
+ data_ =
::
malloc(size_);
break;
case Type::Mmap:
break;
case Type::Mmap:
- data_ = mmap(nullptr, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
+ data_ =
::
mmap(nullptr, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0);
if (data_ == MAP_FAILED) {
data_ = nullptr;
size_ = 0;
if (data_ == MAP_FAILED) {
data_ = nullptr;
size_ = 0;
@@
-59,7
+55,7
@@
buffer::buffer(std::size_t size, Type type) : size_(size), type_(type)
}
}
}
}
-void
b
uffer::clear() noexcept
+void
B
uffer::clear() noexcept
{
switch(type_) {
case Type::Malloc:
{
switch(type_) {
case Type::Malloc:
@@
-81,16
+77,14
@@
RegionSnapshot dense_region(
RegionType region_type,
void *start_addr, void* permanent_addr, size_t size)
{
RegionType region_type,
void *start_addr, void* permanent_addr, size_t size)
{
- simgrid::mc::buffer::Type buffer_type;
+ // When KSM support is enables, we allocate memory using mmap:
+ // * we don't want to madvise bits of the heap;
+ // * mmap gives data aligned on page boundaries which is merge friendly.
+ simgrid::mc::Buffer data;
if (_sg_mc_ksm)
if (_sg_mc_ksm)
- // We use mmap to allocate the memory in order to madvise it.
- // We don't want to madvise the main heap.
- // Moreover we get aligned pgaes which is merge-friendly.
- buffer_type = simgrid::mc::buffer::Type::Mmap;
+ data = Buffer::mmap(size);
else
else
- buffer_type = simgrid::mc::buffer::Type::Malloc;
-
- simgrid::mc::buffer data(size, buffer_type);
+ data = Buffer::malloc(size);
mc_model_checker->process().read_bytes(data.get(), size,
remote(permanent_addr),
mc_model_checker->process().read_bytes(data.get(), size,
remote(permanent_addr),
@@
-98,7
+92,7
@@
RegionSnapshot dense_region(
if (_sg_mc_ksm)
// Mark the region as mergeable *after* we have written into it.
if (_sg_mc_ksm)
// Mark the region as mergeable *after* we have written into it.
- // T
here no point to let KSM do the hard work before that
.
+ // T
rying to merge them before is useless/counterproductive
.
madvise(data.get(), size, MADV_MERGEABLE);
simgrid::mc::RegionSnapshot region(
madvise(data.get(), size, MADV_MERGEABLE);
simgrid::mc::RegionSnapshot region(
@@
-121,11
+115,10
@@
RegionSnapshot region(
RegionType type, void *start_addr, void* permanent_addr, size_t size,
RegionSnapshot const* ref_region)
{
RegionType type, void *start_addr, void* permanent_addr, size_t size,
RegionSnapshot const* ref_region)
{
- if (_sg_mc_sparse_checkpoint)
{
+ if (_sg_mc_sparse_checkpoint)
return sparse_region(type, start_addr, permanent_addr, size, ref_region);
return sparse_region(type, start_addr, permanent_addr, size, ref_region);
- } else {
+ else
return dense_region(type, start_addr, permanent_addr, size);
return dense_region(type, start_addr, permanent_addr, size);
- }
}
RegionSnapshot sparse_region(RegionType region_type,
}
RegionSnapshot sparse_region(RegionType region_type,
@@
-143,14
+136,14
@@
RegionSnapshot sparse_region(RegionType region_type,
"Not at the beginning of a page");
xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
"Not at the beginning of a page");
xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
- size_t page_count =
mc_page_c
ount(size);
+ size_t page_count =
simgrid::mc::mmu::chunkC
ount(size);
std::vector<std::uint64_t> pagemap;
const size_t* ref_page_numbers = nullptr;
if (use_soft_dirty) {
pagemap.resize(page_count);
process->read_pagemap(pagemap.data(),
std::vector<std::uint64_t> pagemap;
const size_t* ref_page_numbers = nullptr;
if (use_soft_dirty) {
pagemap.resize(page_count);
process->read_pagemap(pagemap.data(),
-
mc_page_number(nullptr, permanent_addr)
, page_count);
+
simgrid::mc::mmu::split((std::size_t) permanent_addr).first
, page_count);
ref_page_numbers = ref_region->page_data().pagenos();
}
ref_page_numbers = ref_region->page_data().pagenos();
}