- }else{
-
- MC_SET_RAW_MEM;
-
- size_t current_bytes_used = new_state->heap_bytes_used;
- int current_nb_processes = new_state->nb_processes;
-
- unsigned int cursor = 0;
- int previous_cursor = 0, next_cursor = 0;
- int start = 0;
- int end = xbt_dynar_length(visited_states) - 1;
-
- mc_visited_state_t state_test = NULL;
- size_t bytes_used_test;
- int nb_processes_test;
- int same_processes_and_bytes_not_found = 1;
-
- while(start <= end && same_processes_and_bytes_not_found){
- cursor = (start + end) / 2;
- state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_visited_state_t);
- bytes_used_test = state_test->heap_bytes_used;
- nb_processes_test = state_test->nb_processes;
- if(nb_processes_test < current_nb_processes){
- start = cursor + 1;
- }else if(nb_processes_test > current_nb_processes){
- end = cursor - 1;
- }else if(nb_processes_test == current_nb_processes){
- if(bytes_used_test < current_bytes_used)
- start = cursor + 1;
- if(bytes_used_test > current_bytes_used)
- end = cursor - 1;
- if(bytes_used_test == current_bytes_used){
- same_processes_and_bytes_not_found = 0;
- if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){
- 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;
- }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_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_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 {
+
+ int min = -1, max = -1, index;
+ //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) {
+
+ // Parallell implementation
+ /*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)
+ 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, (min + res) - 1, NULL);
+ xbt_dynar_insert_at(visited_states, (min+res) - 1, &new_state);
+ if(!raw_mem_set)
+ MC_SET_STD_HEAP;
+ 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) {
+ // The state has been visited:
+
+ 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);
+
+ // Replace the old state with the new one (why?):
+ xbt_dynar_remove_at(visited_states, cursor, NULL);
+ xbt_dynar_insert_at(visited_states, cursor, &new_state);
+
+ if (!raw_mem_set)
+ MC_SET_STD_HEAP;
+ return new_state->other_num;