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
model-checker : check current_heap before SET_RAW_MEM and restore it after UNSET_RAW_MEM
[simgrid.git]
/
src
/
mc
/
mc_dpor.c
diff --git
a/src/mc/mc_dpor.c
b/src/mc/mc_dpor.c
index
dd0aba3
..
ac40618
100644
(file)
--- a/
src/mc/mc_dpor.c
+++ b/
src/mc/mc_dpor.c
@@
-13,6
+13,9
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
*/
void MC_dpor_init()
{
*/
void MC_dpor_init()
{
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
mc_state_t initial_state = NULL;
smx_process_t process;
mc_state_t initial_state = NULL;
smx_process_t process;
@@
-42,6
+45,12
@@
void MC_dpor_init()
xbt_fifo_unshift(mc_stack_safety, initial_state);
MC_UNSET_RAW_MEM;
xbt_fifo_unshift(mc_stack_safety, initial_state);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
/* FIXME: Update Statistics
mc_stats->state_size +=
/* FIXME: Update Statistics
mc_stats->state_size +=
@@
-55,6
+64,9
@@
void MC_dpor_init()
*/
void MC_dpor(void)
{
*/
void MC_dpor(void)
{
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
char *req_str;
int value;
smx_simcall_t req = NULL, prev_req = NULL;
char *req_str;
int value;
smx_simcall_t req = NULL, prev_req = NULL;
@@
-111,7
+123,7
@@
void MC_dpor(void)
}
}
}
}
- if(_surf_
do_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_do
_mc_checkpoint == 0)){
+ if(_surf_
mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf
_mc_checkpoint == 0)){
next_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
MC_take_snapshot(next_state->system_state);
}
next_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
MC_take_snapshot(next_state->system_state);
}
@@
-174,7
+186,7
@@
void MC_dpor(void)
}
if (MC_state_interleave_size(state)) {
/* We found a back-tracking point, let's loop */
}
if (MC_state_interleave_size(state)) {
/* We found a back-tracking point, let's loop */
- if(_surf_
do_
mc_checkpoint){
+ if(_surf_mc_checkpoint){
if(state->system_state != NULL){
MC_restore_snapshot(state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
if(state->system_state != NULL){
MC_restore_snapshot(state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
@@
-214,6
+226,13
@@
void MC_dpor(void)
}
MC_print_statistics(mc_stats);
MC_UNSET_RAW_MEM;
}
MC_print_statistics(mc_stats);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
+
return;
}
return;
}