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
[action replay] independent parsing for two optional parameters
[simgrid.git]
/
src
/
mc
/
mc_snapshot.cpp
diff --git
a/src/mc/mc_snapshot.cpp
b/src/mc/mc_snapshot.cpp
index
35276ca
..
2d534f5
100644
(file)
--- a/
src/mc/mc_snapshot.cpp
+++ b/
src/mc/mc_snapshot.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014
-2015
. 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,13
+6,13
@@
#include <stdbool.h>
#include <stdbool.h>
-#include "internal_config.h"
-#include "smpi/private.h"
+#include "
src/
internal_config.h"
+#include "s
rc/s
mpi/private.h"
-#include "mc_snapshot.h"
-#include "mc_private.h"
-#include "mc_mmu.h"
-#include "PageStore.hpp"
+#include "
src/mc/
mc_snapshot.h"
+#include "
src/mc/
mc_private.h"
+#include "
src/mc/
mc_mmu.h"
+#include "
src/mc/
PageStore.hpp"
extern "C" {
extern "C" {
@@
-24,11
+24,11
@@
extern "C" {
* (or NULL if it does not belong to any snapshot region)
* */
mc_mem_region_t mc_get_snapshot_region(
* (or NULL if it does not belong to any snapshot region)
* */
mc_mem_region_t mc_get_snapshot_region(
- const void* addr, const s
_mc_snapshot_
t* snapshot, int process_index)
+ const void* addr, const s
imgrid::mc::Snapsho
t* snapshot, int process_index)
{
{
- size_t n = snapshot->snapshot_regions
_count
;
+ size_t n = snapshot->snapshot_regions
.size()
;
for (size_t i = 0; i != n; ++i) {
for (size_t i = 0; i != n; ++i) {
- mc_mem_region_t region = snapshot->snapshot_regions[i];
+ mc_mem_region_t region = snapshot->snapshot_regions[i]
.get()
;
if (!(region && region->contain(simgrid::mc::remote(addr))))
continue;
if (!(region && region->contain(simgrid::mc::remote(addr))))
continue;
@@
-153,31
+153,20
@@
int MC_snapshot_memcmp(
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-Snapshot::Snapshot() :
-
process(nullptr
),
+Snapshot::Snapshot(
Process* process
) :
+
AddressSpace(process
),
num_state(0),
heap_bytes_used(0),
num_state(0),
heap_bytes_used(0),
- snapshot_regions(nullptr),
- snapshot_regions_count(0),
enabled_processes(),
privatization_index(0),
enabled_processes(),
privatization_index(0),
- stack_sizes(),
- stacks(nullptr),
- to_ignore(nullptr),
- hash(0),
- ignored_data(nullptr)
+ hash(0)
{
}
{
}
+
Snapshot::~Snapshot()
{
Snapshot::~Snapshot()
{
- for (size_t i = 0; i < this->snapshot_regions_count; i++) {
- delete this->snapshot_regions[i];
- }
- xbt_free(this->snapshot_regions);
- xbt_dynar_free(&(this->stacks));
- xbt_dynar_free(&(this->to_ignore));
- xbt_dynar_free(&this->ignored_data);
+
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
@@
-195,12
+184,15
@@
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
}
}
else
}
}
else
- return this->read_bytes(buffer, size, address, process_index, mode);
+ return this->process()->read_bytes(
+ buffer, size, address, process_index, mode);
}
}
}
}
}
}
+}
+
#ifdef SIMGRID_TEST
#include <string.h>
#ifdef SIMGRID_TEST
#include <string.h>
@@
-208,11
+200,9
@@
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
#include <sys/mman.h>
#include <sys/mman.h>
-#include "mc/mc_private.h"
-#include "mc/mc_snapshot.h"
-#include "mc/mc_mmu.h"
-
-extern "C" {
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_mmu.h"
XBT_TEST_SUITE("mc_snapshot", "Snapshots");
XBT_TEST_SUITE("mc_snapshot", "Snapshots");
@@
-254,12
+244,12
@@
static void test_snapshot(bool sparse_checkpoint) {
// Init memory and take snapshots:
init_memory(source, byte_size);
simgrid::mc::RegionSnapshot region0 = simgrid::mc::sparse_region(
// Init memory and take snapshots:
init_memory(source, byte_size);
simgrid::mc::RegionSnapshot region0 = simgrid::mc::sparse_region(
- simgrid::mc::RegionType::Unknown, source, source, byte_size);
+ simgrid::mc::RegionType::Unknown, source, source, byte_size
, nullptr
);
for(int i=0; i<n; i+=2) {
init_memory((char*) source + i*xbt_pagesize, xbt_pagesize);
}
simgrid::mc::RegionSnapshot region = simgrid::mc::sparse_region(
for(int i=0; i<n; i+=2) {
init_memory((char*) source + i*xbt_pagesize, xbt_pagesize);
}
simgrid::mc::RegionSnapshot region = simgrid::mc::sparse_region(
- simgrid::mc::RegionType::Unknown, source, source, byte_size);
+ simgrid::mc::RegionType::Unknown, source, source, byte_size
, nullptr
);
void* destination = mmap(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
xbt_assert(source!=MAP_FAILED, "Could not allocate destination memory");
void* destination = mmap(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
xbt_assert(source!=MAP_FAILED, "Could not allocate destination memory");
@@
-294,7
+284,7
@@
static void test_snapshot(bool sparse_checkpoint) {
xbt_test_add("Read pointer for %i page(s)", n);
memcpy(source, &mc_model_checker, sizeof(void*));
simgrid::mc::RegionSnapshot region2 = simgrid::mc::sparse_region(
xbt_test_add("Read pointer for %i page(s)", n);
memcpy(source, &mc_model_checker, sizeof(void*));
simgrid::mc::RegionSnapshot region2 = simgrid::mc::sparse_region(
- simgrid::mc::RegionType::Unknown, source, source, byte_size);
+ simgrid::mc::RegionType::Unknown, source, source, byte_size
, nullptr
);
xbt_test_assert(MC_region_read_pointer(®ion2, source) == mc_model_checker,
"Mismtach in MC_region_read_pointer()");
}
xbt_test_assert(MC_region_read_pointer(®ion2, source) == mc_model_checker,
"Mismtach in MC_region_read_pointer()");
}
@@
-307,8
+297,5
@@
static void test_snapshot(bool sparse_checkpoint) {
mc_model_checker = NULL;
}
mc_model_checker = NULL;
}
-}
-
#endif /* SIMGRID_TEST */
#endif /* SIMGRID_TEST */
-}