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 branch 'master'
[simgrid.git]
/
src
/
mc
/
mc_page_snapshot.cpp
diff --git
a/src/mc/mc_page_snapshot.cpp
b/src/mc/mc_page_snapshot.cpp
index
60ff820
..
499e5f2
100644
(file)
--- a/
src/mc/mc_page_snapshot.cpp
+++ b/
src/mc/mc_page_snapshot.cpp
@@
-1,6
+1,7
@@
#include "mc_page_store.h"
#include "mc_mmu.h"
#include "mc_private.h"
#include "mc_page_store.h"
#include "mc_mmu.h"
#include "mc_private.h"
+#include "mc_snapshot.h"
#include <xbt/mmalloc.h>
#include <xbt/mmalloc.h>
@@
-176,7
+177,7
@@
mc_mem_region_t mc_region_new_sparse(int type, void *start_addr, void* permanent
uint64_t* pagemap = NULL;
if (_sg_mc_soft_dirty && mc_model_checker->parent_snapshot) {
uint64_t* pagemap = NULL;
if (_sg_mc_soft_dirty && mc_model_checker->parent_snapshot) {
- pagemap = (uint64_t*) mmalloc_no_memset(
(xbt_mheap_t)
mc_heap, sizeof(uint64_t) * page_count);
+ pagemap = (uint64_t*) mmalloc_no_memset(mc_heap, sizeof(uint64_t) * page_count);
mc_read_pagemap(pagemap, mc_page_number(NULL, permanent_addr), page_count);
}
mc_read_pagemap(pagemap, mc_page_number(NULL, permanent_addr), page_count);
}
@@
-185,7
+186,7
@@
mc_mem_region_t mc_region_new_sparse(int type, void *start_addr, void* permanent
ref_reg==NULL ? NULL : ref_reg->page_numbers);
if(pagemap) {
ref_reg==NULL ? NULL : ref_reg->page_numbers);
if(pagemap) {
- mfree(
(xbt_mheap_t)
mc_heap, pagemap);
+ mfree(mc_heap, pagemap);
}
return new_reg;
}
}
return new_reg;
}
@@
-200,7
+201,7
@@
void mc_region_restore_sparse(mc_mem_region_t reg, mc_mem_region_t ref_reg)
// Read soft-dirty bits if necessary in order to know which pages have changed:
if (_sg_mc_soft_dirty && mc_model_checker->parent_snapshot) {
// Read soft-dirty bits if necessary in order to know which pages have changed:
if (_sg_mc_soft_dirty && mc_model_checker->parent_snapshot) {
- pagemap = (uint64_t*) mmalloc_no_memset(
(xbt_mheap_t)
mc_heap, sizeof(uint64_t) * page_count);
+ pagemap = (uint64_t*) mmalloc_no_memset(mc_heap, sizeof(uint64_t) * page_count);
mc_read_pagemap(pagemap, mc_page_number(NULL, reg->permanent_addr), page_count);
}
mc_read_pagemap(pagemap, mc_page_number(NULL, reg->permanent_addr), page_count);
}