- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
- return state_test->num;
- }else{
- /* Search another state with same number of bytes used in std_heap */
- previous_cursor = cursor - 1;
- while(previous_cursor >= 0){
- state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, previous_cursor, mc_visited_state_t);
- bytes_used_test = state_test->system_state->heap_bytes_used;
- if(bytes_used_test != current_bytes_used)
- break;
- if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){
- xbt_dynar_remove_at(visited_states, previous_cursor, NULL);
- xbt_dynar_insert_at(visited_states, previous_cursor, &new_state);
- XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num);
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
- return state_test->num;
- }
- previous_cursor--;
- }
- next_cursor = cursor + 1;
- while(next_cursor < xbt_dynar_length(visited_states)){
- state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, next_cursor, mc_visited_state_t);
- bytes_used_test = state_test->system_state->heap_bytes_used;
- if(bytes_used_test != current_bytes_used)
- break;
- if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){
- xbt_dynar_remove_at(visited_states, next_cursor, NULL);
- xbt_dynar_insert_at(visited_states, next_cursor, &new_state);
- XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num);
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
- return state_test->num;
- }
- next_cursor++;
- }
- }
+ 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;