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 : detect if binary program has been compiled with -g and with optimizations
[simgrid.git]
/
src
/
mc
/
mc_dpor.c
diff --git
a/src/mc/mc_dpor.c
b/src/mc/mc_dpor.c
index
b03fd4b
..
3c56d0d
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;
@@
-36,12
+39,15
@@
void MC_dpor_init()
}
}
}
}
- initial_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(initial_state->system_state);
-
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
+61,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
+120,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
+183,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);
@@
-182,19
+191,19
@@
void MC_dpor(void)
MC_UNSET_RAW_MEM;
}else{
pos = xbt_fifo_size(mc_stack_safety);
MC_UNSET_RAW_MEM;
}else{
pos = xbt_fifo_size(mc_stack_safety);
- item = xbt_fifo_get_
la
st_item(mc_stack_safety);
+ item = xbt_fifo_get_
fir
st_item(mc_stack_safety);
while(pos>0){
restore_state = (mc_state_t) xbt_fifo_get_item_content(item);
if(restore_state->system_state != NULL){
break;
}else{
while(pos>0){
restore_state = (mc_state_t) xbt_fifo_get_item_content(item);
if(restore_state->system_state != NULL){
break;
}else{
- item = xbt_fifo_get_
prev
_item(item);
+ item = xbt_fifo_get_
next
_item(item);
pos--;
}
}
MC_restore_snapshot(restore_state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
pos--;
}
}
MC_restore_snapshot(restore_state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d",
pos
);
+ XBT_DEBUG("Back-tracking to depth %d",
xbt_fifo_size(mc_stack_safety)
);
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, pos);
}
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, pos);
}
@@
-202,7
+211,7
@@
void MC_dpor(void)
xbt_fifo_unshift(mc_stack_safety, state);
XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
xbt_fifo_unshift(mc_stack_safety, state);
XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
- MC_replay(mc_stack_safety, 1);
+ MC_replay(mc_stack_safety,
-
1);
}
break;
} else {
}
break;
} else {
@@
-214,6
+223,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;
}