XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
"Logging specific to MC DPOR exploration");
+xbt_dynar_t visited_states;
+
+static int is_visited_state(void);
+
+static int is_visited_state(){
+
+ if(_surf_mc_stateful == 0)
+ return 0;
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+
+ mc_snapshot_t new_state = NULL;
+ new_state = MC_take_snapshot();
+
+ MC_UNSET_RAW_MEM;
+
+ if(xbt_dynar_is_empty(visited_states)){
+
+ MC_SET_RAW_MEM;
+ xbt_dynar_push(visited_states, &new_state);
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
+ return 0;
+
+ }else{
+
+ MC_SET_RAW_MEM;
+
+ unsigned int cursor = 0;
+ mc_snapshot_t state_test = NULL;
+
+ xbt_dynar_foreach(visited_states, cursor, state_test){
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug))
+ XBT_DEBUG("****** Pair visited #%d ******", cursor + 1);
+ if(snapshot_compare(new_state, state_test, NULL, NULL) == 0){
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
+ return 1;
+ }
+ }
+
+ if(xbt_dynar_length(visited_states) == _surf_mc_stateful){
+ mc_snapshot_t state_to_remove = NULL;
+ xbt_dynar_shift(visited_states, &state_to_remove);
+ MC_free_snapshot(state_to_remove);
+ }
+
+ xbt_dynar_push(visited_states, &new_state);
+
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
+ return 0;
+
+ }
+}
+
/**
* \brief Initialize the DPOR exploration algorithm
*/
void MC_dpor_init()
{
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
mc_state_t initial_state = NULL;
smx_process_t process;
/* Create the initial state and push it into the exploration stack */
MC_SET_RAW_MEM;
+
initial_state = MC_state_new();
+ visited_states = xbt_dynar_new(sizeof(mc_snapshot_t), NULL);
+
MC_UNSET_RAW_MEM;
XBT_DEBUG("**************************************************");
MC_wait_for_requests();
MC_SET_RAW_MEM;
+
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
+ }
+ }
+
/* Get an enabled process and insert it in the interleave set of the initial state */
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
}
}
- 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;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
/* FIXME: Update Statistics
mc_stats->state_size +=
*/
void MC_dpor(void)
{
+
char *req_str;
int value;
smx_simcall_t req = NULL, prev_req = NULL;
/* If there are processes to interleave and the maximum depth has not been reached
then perform one step of the exploration algorithm */
- if (xbt_fifo_size(mc_stack_safety) < MAX_DEPTH &&
+ if (xbt_fifo_size(mc_stack_safety) < _surf_mc_max_depth &&
(req = MC_state_get_request(state, &value))) {
/* Debug information */
MC_SET_RAW_MEM;
next_state = MC_state_new();
-
- /* Get an enabled process and insert it in the interleave set of the next state */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(next_state, process);
- break;
+
+ if(!is_visited_state()){
+
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
+ }
+ }
+
+ /* Get an enabled process and insert it in the interleave set of the next state */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(next_state, process);
+ break;
+ }
+ }
+
+ if(_surf_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_mc_checkpoint == 0)){
+ next_state->system_state = MC_take_snapshot();
}
- }
- if(_surf_do_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_do_mc_checkpoint == 0)){
- next_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(next_state->system_state);
}
xbt_fifo_unshift(mc_stack_safety, next_state);
/* The interleave set is empty or the maximum depth is reached, let's back-track */
} else {
- XBT_DEBUG("There are no more processes to interleave.");
+
+ if(xbt_fifo_size(mc_stack_safety) == _surf_mc_max_depth){
+
+ XBT_WARN("/!\\ Max depth reached ! /!\\ ");
+ if(req != NULL){
+ XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ ");
+ XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value.");
+ }
+
+ }else{
+
+ XBT_DEBUG("There are no more processes to interleave.");
+
+ }
/* Trash the current state, no longer needed */
MC_SET_RAW_MEM;
}
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);
}
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_print_statistics(mc_stats);
- MC_UNSET_RAW_MEM;
+ MC_UNSET_RAW_MEM;
+
return;
}
