new_state = xbt_new0(s_mc_visited_state_t, 1);
new_state->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
new_state->nb_processes = xbt_swag_size(simix_global->process_list);
- new_state->system_state = MC_take_snapshot();
+ new_state->system_state = MC_take_snapshot(mc_stats->expanded_states);
new_state->num = mc_stats->expanded_states;
new_state->other_num = -1;
}else{
int min = -1, max = -1, index;
- int res;
+ //int res;
mc_visited_state_t state_test;
+ int cursor;
index = get_search_interval(visited_states, new_state, &min, &max);
if(min != -1 && max != -1){
- res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_states, min), (max-min)+1, new_state);
+ /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_states, min), (max-min)+1, new_state);
if(res != -1){
state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, (min+res)-1, mc_visited_state_t);
if(state_test->other_num == -1)
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
return new_state->other_num;
- }
+ }*/
+ cursor = min;
+ while(cursor <= max){
+ state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_visited_state_t);
+ if(snapshot_compare(state_test, new_state) == 0){
+ if(state_test->other_num == -1)
+ new_state->other_num = state_test->num;
+ else
+ new_state->other_num = state_test->other_num;
+ if(dot_output == NULL)
+ XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num);
+ else
+ XBT_DEBUG("State %d already visited ! (equal to state %d (state %d in dot_output))", new_state->num, state_test->num, new_state->other_num);
+ xbt_dynar_remove_at(visited_states, cursor, NULL);
+ xbt_dynar_insert_at(visited_states, cursor, &new_state);
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+ return new_state->other_num;
+ }
+ cursor++;
+ }
xbt_dynar_insert_at(visited_states, min, &new_state);
}else{
state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, index, mc_visited_state_t);
/* Wait for requests (schedules processes) */
MC_wait_for_requests();
+ MC_ignore_heap(simix_global->process_to_run->data, 0);
+ MC_ignore_heap(simix_global->process_that_ran->data, 0);
+
MC_SET_RAW_MEM;
/* Get an enabled process and insert it in the interleave set of the initial state */
mc_state_t state = NULL, prev_state = NULL, next_state = NULL, restore_state=NULL;
smx_process_t process = NULL;
xbt_fifo_item_t item = NULL;
+ mc_state_t state_test = NULL;
int pos;
int visited_state = -1;
int enabled = 0;
xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety));
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Exploration depth=%d (state=%p, num %d)(%u interleave, user_max_depth %d)",
+ XBT_DEBUG("Exploration depth=%d (state=%p, num %d)(%u interleave, user_max_depth %d, first_enabled_state size : %d)",
xbt_fifo_size(mc_stack_safety), state, state->num,
- MC_state_interleave_size(state), user_max_depth_reached);
+ MC_state_interleave_size(state), user_max_depth_reached, xbt_dict_size(first_enabled_state));
/* Update statistics */
mc_stats->visited_states++;
}
if(_sg_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _sg_mc_checkpoint == 0)){
- next_state->system_state = MC_take_snapshot();
+ next_state->system_state = MC_take_snapshot(next_state->num);
}
if(dot_output != NULL)
char *key = bprintf("%lu", process->pid);
enabled = (int)strtoul(xbt_dict_get_or_null(first_enabled_state, key), 0, 10);
xbt_free(key);
- mc_state_t state_test = NULL;
- xbt_fifo_item_t item = NULL;
int cursor = xbt_fifo_size(mc_stack_safety);
xbt_fifo_foreach(mc_stack_safety, item, state_test, mc_state_t){
if(cursor-- == enabled){
break;
}
}
- }
+ }
}
}
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, -1);
}
- XBT_DEBUG("Back-tracking to state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety));
+ XBT_DEBUG("Back-tracking to state %d at depth %d done", state->num, xbt_fifo_size(mc_stack_safety));
break;
} else {
XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1);