> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
> [ 0.000000] (2:client@Boivin) Ask the request
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS already used. Queue the request.
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. Grant to queued requests (queue size: 1)
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS already used. Queue the request.
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. Grant to queued requests (queue size: 1)
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
> [ 0.000000] (2:client@Boivin) Ask the request
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (1:coordinator@Tremblay) CS already used. Queue the request.
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (1:coordinator@Tremblay) CS release. Grant to queued requests (queue size: 1)
+> [ 0.000000] (2:client@Boivin) Ask the request
+> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
> [ 0.000000] (1:coordinator@Tremblay) CS release. Grant to queued requests (queue size: 1)
> [ 0.000000] (2:client@Boivin) Ask the request
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
+> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
> [ 0.000000] (2:client@Boivin) Ask the request
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
+> [ 0.000000] (3:client@Fafard) Propositions changed : r=1, cs=0
> [ 0.000000] (1:coordinator@Tremblay) CS idle. Grant immediatly
> [ 0.000000] (2:client@Boivin) 2 got the answer. Sleep a bit and release it
> [ 0.000000] (1:coordinator@Tremblay) CS release. resource now idle
> [ 0.000000] (0:@) [(2)Boivin (client)] Wait(comm=(verbose only) [(1)Tremblay (coordinator)-> (2)Boivin (client)]) (62)
> [ 0.000000] (0:@) [(2)Boivin (client)] iSend(src=(2)Boivin (client), buff=(verbose only), size=(verbose only)) (54)
> [ 0.000000] (0:@) Expanded pairs = 57
-> [ 0.000000] (0:@) Visited pairs = 208
-> [ 0.000000] (0:@) Executed transitions = 207
\ No newline at end of file
+> [ 0.000000] (0:@) Visited pairs = 365
+> [ 0.000000] (0:@) Executed transitions = 364
return values;
}
-static int get_search_interval(xbt_dynar_t all_pairs, mc_pair_t pair, int *min, int *max){
+static int get_search_interval(xbt_dynar_t all_pairs, mc_visited_pair_t pair, int *min, int *max){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
int cursor = 0, previous_cursor, next_cursor;
- mc_pair_t pair_test;
+ mc_visited_pair_t pair_test;
int start = 0;
int end = xbt_dynar_length(all_pairs) - 1;
while(start <= end){
cursor = (start + end) / 2;
- pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, cursor, mc_pair_t);
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(all_pairs, cursor, mc_visited_pair_t);
if(pair_test->nb_processes < pair->nb_processes){
start = cursor + 1;
}else if(pair_test->nb_processes > pair->nb_processes){
*min = *max = cursor;
previous_cursor = cursor - 1;
while(previous_cursor >= 0){
- pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, previous_cursor, mc_pair_t);
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(all_pairs, previous_cursor, mc_visited_pair_t);
if(pair_test->nb_processes != pair->nb_processes || pair_test->heap_bytes_used != pair->heap_bytes_used)
break;
*min = previous_cursor;
}
next_cursor = cursor + 1;
while(next_cursor < xbt_dynar_length(all_pairs)){
- pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, next_cursor, mc_pair_t);
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(all_pairs, next_cursor, mc_visited_pair_t);
if(pair_test->nb_processes != pair->nb_processes || pair_test->heap_bytes_used != pair->heap_bytes_used)
break;
*max = next_cursor;
return cursor;
}
-static int is_reached_acceptance_pair(mc_pair_t pair){
+static mc_visited_pair_t is_reached_acceptance_pair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
-
+
+ mc_visited_pair_t pair = NULL;
+ pair = MC_visited_pair_new(pair_num, automaton_state, atomic_propositions);
+ pair->acceptance_pair = 1;
+
if(xbt_dynar_is_empty(acceptance_pairs)){
- if(pair->graph_state->system_state == NULL){
- pair->graph_state->system_state = MC_take_snapshot();
- pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
- }
xbt_dynar_push(acceptance_pairs, &pair);
- if(!raw_mem_set)
- MC_UNSET_RAW_MEM;
-
- return -1;
-
}else{
- if(pair->graph_state->system_state == NULL){
- pair->graph_state->system_state = MC_take_snapshot();
- pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
- }
-
int min = -1, max = -1, index;
//int res;
- mc_pair_t pair_test;
+ mc_visited_pair_t pair_test;
int cursor;
index = get_search_interval(acceptance_pairs, pair, &min, &max);
}*/
cursor = min;
while(cursor <= max){
- pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t);
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_visited_pair_t);
if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){
if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){
if(snapshot_compare(pair_test, pair) == 0){
+ XBT_INFO("Pair %d already reached (equal to pair %d) !", pair->num, pair_test->num);
+
+ xbt_fifo_shift(mc_stack_liveness);
+ if(dot_output != NULL)
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, pair_test->num, initial_state_liveness->prev_req);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
- return pair_test->num;
+
+ return NULL;
}
}
}
}
xbt_dynar_insert_at(acceptance_pairs, min, &pair);
}else{
- pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, index, mc_pair_t);
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(acceptance_pairs, index, mc_visited_pair_t);
if(pair_test->nb_processes < pair->nb_processes){
xbt_dynar_insert_at(acceptance_pairs, index+1, &pair);
}else{
xbt_dynar_insert_at(acceptance_pairs, index, &pair);
}
}
-
- if(!raw_mem_set)
- MC_UNSET_RAW_MEM;
-
- return -1;
-
- }
-
-}
-
-
-static void set_acceptance_pair_reached(mc_pair_t pair){
-
- int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- MC_SET_RAW_MEM;
-
- if(xbt_dynar_is_empty(acceptance_pairs)){
-
- if(pair->graph_state->system_state == NULL){
- pair->graph_state->system_state = MC_take_snapshot();
- pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
- }
- xbt_dynar_push(acceptance_pairs, &pair);
-
- }else{
-
- if(pair->graph_state->system_state == NULL){
- pair->graph_state->system_state = MC_take_snapshot();
- pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
- }
- size_t current_bytes_used = pair->heap_bytes_used;
- int current_nb_processes = pair->nb_processes;
-
- int cursor = 0;
- int start = 0;
- int end = xbt_dynar_length(acceptance_pairs) - 1;
-
- mc_pair_t pair_test = NULL;
- size_t bytes_used_test = 0;
- int nb_processes_test;
-
- while(start <= end){
- cursor = (start + end) / 2;
- pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t);
- bytes_used_test = pair_test->heap_bytes_used;
- nb_processes_test = pair_test->nb_processes;
- if(nb_processes_test < current_nb_processes)
- start = cursor + 1;
- if(nb_processes_test > current_nb_processes)
- end = cursor - 1;
- 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)
- break;
- }
- }
-
- if(pair_test->nb_processes < pair->nb_processes){
- xbt_dynar_insert_at(acceptance_pairs, cursor+1, &pair);
- }else{
- if(pair_test->heap_bytes_used < pair->heap_bytes_used)
- xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair);
- else
- xbt_dynar_insert_at(acceptance_pairs, cursor, &pair);
- }
-
}
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
-
+
+ return pair;
+
}
-static void remove_acceptance_pair(mc_pair_t pair){
+static void remove_acceptance_pair(int pair_num){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+ fprintf(stderr, "Search acceptance pair %d\n", pair_num);
+
MC_SET_RAW_MEM;
unsigned int cursor = 0;
- mc_pair_t pair_test;
- int pair_found = 0;
+ mc_visited_pair_t pair_test = NULL;
xbt_dynar_foreach(acceptance_pairs, cursor, pair_test){
- if(pair_test->num == pair->num){
- pair_found = 1;
+ if(pair_test->num == pair_num){
break;
}
}
- if(pair_found)
- xbt_dynar_remove_at(acceptance_pairs, cursor, NULL);
+ xbt_dynar_remove_at(acceptance_pairs, cursor, &pair_test);
- pair->acceptance_removed = 1;
+ pair_test->acceptance_removed = 1;
- if(pair->stack_removed && pair->acceptance_removed){
- if(_sg_mc_visited == 0){
- MC_pair_delete(pair);
- }else if(pair->visited_removed){
- MC_pair_delete(pair);
- }
+ if(_sg_mc_visited == 0){
+ MC_visited_pair_delete(pair_test);
+ }else if(pair_test->visited_removed == 1){
+ MC_visited_pair_delete(pair_test);
}
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
}
-static int is_visited_pair(mc_pair_t pair){
+static int is_visited_pair(mc_visited_pair_t pair, int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions){
if(_sg_mc_visited == 0)
return -1;
MC_SET_RAW_MEM;
- if(xbt_dynar_is_empty(visited_pairs)){
+ mc_visited_pair_t new_pair = NULL;
- if(pair->graph_state->system_state == NULL)
- pair->graph_state->system_state = MC_take_snapshot();
- xbt_dynar_push(visited_pairs, &pair);
+ if(pair == NULL){
+ new_pair = MC_visited_pair_new(pair_num, automaton_state, atomic_propositions);
+ }else{
+ new_pair = pair;
+ }
- if(!raw_mem_set)
- MC_UNSET_RAW_MEM;
+ if(xbt_dynar_is_empty(visited_pairs)){
- return -1;
+ xbt_dynar_push(visited_pairs, &new_pair);
}else{
- if(pair->graph_state->system_state == NULL)
- pair->graph_state->system_state = MC_take_snapshot();
-
int min = -1, max = -1, index;
//int res;
- mc_pair_t pair_test;
+ mc_visited_pair_t pair_test;
int cursor;
- index = get_search_interval(visited_pairs, pair, &min, &max);
+ index = get_search_interval(visited_pairs, new_pair, &min, &max);
if(min != -1 && max != -1){ // Visited pair with same number of processes and same heap bytes used exists
/*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_pairs, min), (max-min)+1, pair);
}*/
cursor = min;
while(cursor <= max){
- pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_pair_t);
- if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){
- if(snapshot_compare(pair_test, pair) == 0){
- if(pair_test->other_num == -1)
- pair->other_num = pair_test->num;
- else
- pair->other_num = pair_test->other_num;
- if(dot_output == NULL)
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num);
- else
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num);
- xbt_dynar_remove_at(visited_pairs, cursor, NULL);
- xbt_dynar_insert_at(visited_pairs, cursor, &pair);
- pair_test->visited_removed = 1;
- if(pair_test->stack_removed && pair_test->visited_removed){
- if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){
- if(pair_test->acceptance_removed){
- MC_pair_delete(pair_test);
- }
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_visited_pair_t);
+ //if(pair_test->acceptance_pair == 0){ /* Acceptance pair have been already checked before */
+ if(xbt_automaton_state_compare(pair_test->automaton_state, new_pair->automaton_state) == 0){
+ if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, new_pair->atomic_propositions) == 0){
+ if(snapshot_compare(pair_test, new_pair) == 0){
+ if(pair_test->other_num == -1)
+ new_pair->other_num = pair_test->num;
+ else
+ new_pair->other_num = pair_test->other_num;
+ if(dot_output == NULL)
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_pair->num, pair_test->num);
+ else
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", new_pair->num, pair_test->num, pair->other_num);
+ xbt_dynar_remove_at(visited_pairs, cursor, NULL);
+ xbt_dynar_insert_at(visited_pairs, cursor, &new_pair);
+ pair_test->visited_removed = 1;
+ if(pair_test->acceptance_pair){
+ if(pair_test->acceptance_removed == 1)
+ MC_visited_pair_delete(pair_test);
}else{
- MC_pair_delete(pair_test);
+ MC_visited_pair_delete(pair_test);
}
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+ return new_pair->other_num;
}
- if(!raw_mem_set)
- MC_UNSET_RAW_MEM;
- return pair->other_num;
}
- }
+ //}
}
cursor++;
}
- xbt_dynar_insert_at(visited_pairs, min, &pair);
+ xbt_dynar_insert_at(visited_pairs, min, &new_pair);
}else{
- pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, index, mc_pair_t);
- if(pair_test->nb_processes < pair->nb_processes){
- xbt_dynar_insert_at(visited_pairs, index+1, &pair);
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, index, mc_visited_pair_t);
+ if(pair_test->nb_processes < new_pair->nb_processes){
+ xbt_dynar_insert_at(visited_pairs, index+1, &new_pair);
}else{
- if(pair_test->heap_bytes_used < pair->heap_bytes_used)
- xbt_dynar_insert_at(visited_pairs, index + 1, &pair);
+ if(pair_test->heap_bytes_used < new_pair->heap_bytes_used)
+ xbt_dynar_insert_at(visited_pairs, index + 1, &new_pair);
else
- xbt_dynar_insert_at(visited_pairs, index, &pair);
+ xbt_dynar_insert_at(visited_pairs, index, &new_pair);
}
}
}
xbt_dynar_remove_at(visited_pairs, index2, &pair_test);
pair_test->visited_removed = 1;
- if(pair_test->stack_removed && pair_test->acceptance_removed && pair_test->visited_removed)
- MC_pair_delete(pair_test);
-
+ if(pair_test->acceptance_pair){
+ if(pair_test->acceptance_removed)
+ MC_visited_pair_delete(pair_test);
+ }else{
+ MC_visited_pair_delete(pair_test);
+ }
}
- if(!raw_mem_set)
- MC_UNSET_RAW_MEM;
-
- return -1;
-
}
+
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+
+ return -1;
}
static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, xbt_dynar_t atomic_propositions_values){
MC_SET_RAW_MEM;
- acceptance_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL);
- visited_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL);
+ acceptance_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
+ visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
- initial_state_liveness->snapshot = MC_take_snapshot();
+ initial_state_liveness->snapshot = MC_take_snapshot(0);
initial_state_liveness->prev_pair = 0;
MC_UNSET_RAW_MEM;
if(cursor != 0){
MC_restore_snapshot(initial_state_liveness->snapshot);
MC_UNSET_RAW_MEM;
- }
-
-
- }else if(automaton_state->type == 2){ /* Acceptance automaton state */
-
- MC_SET_RAW_MEM;
-
- initial_pair = MC_pair_new();
- initial_pair->automaton_state = automaton_state;
- initial_pair->graph_state = MC_state_new();
- initial_pair->atomic_propositions = get_atomic_propositions_values();
-
- /* Get enabled process and insert it in the interleave set of the graph_state */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(initial_pair->graph_state, process);
- }
- }
-
- initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state);
- initial_pair->search_cycle = 1;
-
- xbt_fifo_unshift(mc_stack_liveness, initial_pair);
-
- MC_UNSET_RAW_MEM;
-
- set_acceptance_pair_reached(initial_pair);
-
- MC_ddfs();
-
- if(cursor != 0){
- MC_restore_snapshot(initial_state_liveness->snapshot);
- MC_UNSET_RAW_MEM;
- }
+ }
}
}
/* Update current state in buchi automaton */
_mc_property_automaton->current_state = current_pair->automaton_state;
- XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size %d)", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle, MC_state_interleave_size(current_pair->graph_state));
+ XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size %d, pair_num %d)", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle, MC_state_interleave_size(current_pair->graph_state), current_pair->num);
mc_stats->visited_pairs++;
xbt_automaton_transition_t transition_succ;
unsigned int cursor = 0;
int res;
- int reached_num, visited_num;
+ int visited_num;
mc_pair_t next_pair = NULL;
xbt_dynar_t prop_values = NULL;
+ int new_pair = 0;
+ mc_visited_pair_t reached_pair = NULL;
if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){
if(current_pair->search_cycle){
if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
-
- if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){
-
- XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num);
-
- MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness);
- if(dot_output != NULL)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, reached_num, initial_state_liveness->prev_req);
- MC_UNSET_RAW_MEM;
+ if((reached_pair = is_reached_acceptance_pair(current_pair->num, current_pair->automaton_state, current_pair->atomic_propositions)) == NULL){
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
}
}
- if((visited_num = is_visited_pair(current_pair)) != -1){
+ if((visited_num = is_visited_pair(reached_pair, current_pair->num, current_pair->automaton_state, current_pair->atomic_propositions)) != -1){
MC_SET_RAW_MEM;
if(dot_output != NULL)
fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, visited_num, initial_state_liveness->prev_req);
MC_UNSET_RAW_MEM;
-
-
+
}else{
while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){
if(res == 1){ // enabled transition in automaton
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
+
MC_SET_RAW_MEM;
next_pair = MC_pair_new();
MC_UNSET_RAW_MEM;
+ new_pair = 1;
+
MC_ddfs();
}
res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
if(res == 2){ // true transition in automaton
+
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
MC_SET_RAW_MEM;
MC_UNSET_RAW_MEM;
+ new_pair = 1;
+
MC_ddfs();
}
}
- }else{
-
- mc_stats->executed_transitions++;
-
- XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton.");
-
- if(current_pair->search_cycle){
-
- if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
-
- if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){
-
- XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num);
-
- MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness);
- MC_UNSET_RAW_MEM;
-
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("| ACCEPTANCE CYCLE |");
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("Counter-example that violates formula :");
- MC_show_stack_liveness(mc_stack_liveness);
- MC_dump_stack_liveness(mc_stack_liveness);
- MC_print_statistics(mc_stats);
- xbt_abort();
-
- }
- }
- }
-
- if((visited_num = is_visited_pair(current_pair)) != -1){
-
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num);
-
- }else{
-
- MC_SET_RAW_MEM;
- prop_values = get_atomic_propositions_values();
- MC_UNSET_RAW_MEM;
-
- /* Evaluate enabled transition according to atomic propositions values */
- cursor= 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
-
- res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
-
- if(res == 1){ // enabled transition in automaton
-
- MC_SET_RAW_MEM;
-
- next_pair = MC_pair_new();
- next_pair->graph_state = MC_state_new();
- next_pair->automaton_state = transition_succ->dst;
- next_pair->atomic_propositions = get_atomic_propositions_values();
- next_pair->requests = MC_state_interleave_size(next_pair->graph_state);
-
- if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle)
- next_pair->search_cycle = 1;
-
- xbt_fifo_unshift(mc_stack_liveness, next_pair);
-
- if(mc_stats->expanded_pairs%1000 == 0)
- XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
-
- if(dot_output != NULL)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, "");
-
- MC_UNSET_RAW_MEM;
-
- MC_ddfs();
-
- }
-
- }
-
- /* Then, evaluate true transitions (always true, whatever atomic propositions values) */
- cursor = 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
-
- res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
-
- if(res == 2){ // true transition in automaton
-
- MC_SET_RAW_MEM;
-
- next_pair = MC_pair_new();
- next_pair->graph_state = MC_state_new();
- next_pair->automaton_state = transition_succ->dst;
- next_pair->atomic_propositions = get_atomic_propositions_values();
- next_pair->requests = MC_state_interleave_size(next_pair->graph_state);
-
- if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle)
- next_pair->search_cycle = 1;
-
- xbt_fifo_unshift(mc_stack_liveness, next_pair);
-
- if(mc_stats->expanded_pairs%1000 == 0)
- XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
-
- if(dot_output != NULL)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, "");
-
- MC_UNSET_RAW_MEM;
-
- MC_ddfs();
-
- }
-
- }
- }
}
}else{
MC_SET_RAW_MEM;
xbt_dynar_free(&prop_values);
current_pair = xbt_fifo_shift(mc_stack_liveness);
- current_pair->stack_removed = 1;
- if(current_pair->search_cycle){
- remove_acceptance_pair(current_pair);
- }else{
- if(_sg_mc_visited == 0)
- MC_pair_delete(current_pair);
- else if(current_pair->visited_removed)
- MC_pair_delete(current_pair);
+ if(xbt_fifo_size(mc_stack_liveness) != _sg_mc_max_depth -1 && current_pair->requests > 0 && current_pair->search_cycle){
+ remove_acceptance_pair(current_pair->num);
}
+ MC_pair_delete(current_pair);
MC_UNSET_RAW_MEM;
