xbt_dynar_t visited_pairs_hash;
xbt_dynar_t successors;
+
/* fast implementation of djb2 algorithm */
unsigned int hash_region(char *str, int str_len){
if(s1->num_reg != s2->num_reg){
- //XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
+ XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
return 1;
}
int i;
+ int errors = 0;
for(i=0 ; i< s1->num_reg ; i++){
if(s1->regions[i]->type != s2->regions[i]->type){
- //XBT_DEBUG("Different type of region");
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different type of region");
+ errors++;
+ }else{
+ return 1;
+ }
}
switch(s1->regions[i]->type){
case 0:
if(s1->regions[i]->size != s2->regions[i]->size){
- //XBT_DEBUG("Different size of heap (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size of heap (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- //XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){
- //XBT_DEBUG("Different heap (mmalloc_compare)");
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different heap (mmalloc_compare)");
+ errors++;
+ }else{
+ return 1;
+ }
}
break;
case 1 :
if(s1->regions[i]->size != s2->regions[i]->size){
- //XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- //XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- //XBT_DEBUG("Different memcmp for data in libsimgrid");
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different memcmp for data in libsimgrid");
+ errors++;
+ }else{
+ return 1;
+ }
}
break;
- case 2:
+ /*case 2:
if(s1->regions[i]->size != s2->regions[i]->size){
- //XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
- return 1;
- }
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ errors++;
+ }else{
+ return 1;
+ }
+ }
if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- //XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- //XBT_DEBUG("Different memcmp for data in program");
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different memcmp for data in program");
+ errors++;
+ }else{
+ return 1;
+ }
}
- break;
+ break;*/
case 3:
if(s1->regions[i]->size != s2->regions[i]->size){
- //XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- //XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ errors++;
+ }else{
+ return 1;
+ }
}
if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- //XBT_DEBUG("Different memcmp for data in stack");
- return 1;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different memcmp for data in stack");
+ errors++;
+ }else{
+ return 1;
+ }
}
break;
+ default:
+ break;
}
}
- return 0;
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ return (errors>0);
+ }else{
+ return 0;
+ }
}
xbt_dynar_foreach(reached_pairs, cursor, pair_test){
if(automaton_state_compare(pair_test->automaton_state, st) == 0){
if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){
+ XBT_DEBUG("Pair reached %d", cursor+1);
if(snapshot_compare(pair_test->system_state, sn) == 0){
MC_free_snapshot(sn);
xbt_dynar_reset(prop_ato);
return p;
}
-void MC_ddfs_stateless_init(){
+void MC_ddfs_init(void){
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Double-DFS stateless init");
+ XBT_DEBUG("Double-DFS init");
XBT_DEBUG("**************************************************");
mc_pair_stateless_t mc_initial_pair = NULL;
}
}
- //reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
- reached_pairs_hash = xbt_dynar_new(sizeof(mc_pair_reached_hash_t), NULL);
+ reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
+ //reached_pairs_hash = xbt_dynar_new(sizeof(mc_pair_reached_hash_t), NULL);
//visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), NULL);
visited_pairs_hash = xbt_dynar_new(sizeof(mc_pair_visited_hash_t), NULL);
successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
MC_SET_RAW_MEM;
mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state));
- xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
+ xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair);
MC_UNSET_RAW_MEM;
if(cursor != 0){
MC_UNSET_RAW_MEM;
}
- MC_ddfs_stateless(0);
+ MC_ddfs(0);
}else{
if(state->type == 2){
MC_SET_RAW_MEM;
mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state));
- xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
+ xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair);
MC_UNSET_RAW_MEM;
- //set_pair_reached(state);
- set_pair_reached_hash(state);
+ set_pair_reached(state);
+ //set_pair_reached_hash(state);
if(cursor != 0){
MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
}
- MC_ddfs_stateless(1);
+ MC_ddfs(1);
}
}
}
-void MC_ddfs_stateless(int search_cycle){
+void MC_ddfs(int search_cycle){
smx_process_t process;
mc_pair_stateless_t current_pair = NULL;
- if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
+ if(xbt_fifo_size(mc_stack_liveness) == 0)
return;
/* Get current pair */
- current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless));
+ current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness));
/* Update current state in buchi automaton */
automaton->current_state = current_pair->automaton_state;
- XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateless), search_cycle);
+ XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id, MC_state_interleave_size(current_pair->graph_state));
mc_stats_pair->visited_pairs++;
- //sleep(1);
+ sleep(1);
int value;
mc_state_t next_graph_state = NULL;
mc_pair_stateless_t next_pair = NULL;
mc_pair_stateless_t pair_succ;
- if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
+ if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
//set_pair_visited(current_pair->automaton_state, search_cycle);
set_pair_visited_hash(current_pair->automaton_state, search_cycle);
if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
- //if(reached(pair_succ->automaton_state)){
- if(reached_hash(pair_succ->automaton_state)){
+ if(reached(pair_succ->automaton_state)){
+ //if(reached_hash(pair_succ->automaton_state)){
- XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1, MC_state_interleave_size(pair_succ->graph_state));
+ XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("Counter-example that violates formula :");
- MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
- MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless);
+ MC_show_stack_liveness(mc_stack_liveness);
+ MC_dump_stack_liveness(mc_stack_liveness);
MC_print_statistics_pairs(mc_stats_pair);
exit(0);
}else{
- XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+ XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- //set_pair_reached(pair_succ->automaton_state);
- set_pair_reached_hash(pair_succ->automaton_state);
+ set_pair_reached(pair_succ->automaton_state);
+ //set_pair_reached_hash(pair_succ->automaton_state);
- //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(search_cycle);
+ MC_ddfs(search_cycle);
}
//if(!visited(pair_succ->automaton_state, search_cycle)){
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(search_cycle);
+ MC_ddfs(search_cycle);
}else{
if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
- XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+ XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- //set_pair_reached(pair_succ->automaton_state);
- set_pair_reached_hash(pair_succ->automaton_state);
+ set_pair_reached(pair_succ->automaton_state);
+ //set_pair_reached_hash(pair_succ->automaton_state);
search_cycle = 1;
- //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
}
//if(!visited(pair_succ->automaton_state, search_cycle)){
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(search_cycle);
+ MC_ddfs(search_cycle);
}else{
/* Restore system before checking others successors */
if(cursor != (xbt_dynar_length(successors) - 1))
- MC_replay_liveness(mc_stack_liveness_stateless, 1);
+ MC_replay_liveness(mc_stack_liveness, 1);
}
if(MC_state_interleave_size(current_pair->graph_state) > 0){
- XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateless));
- MC_replay_liveness(mc_stack_liveness_stateless, 0);
+ XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness));
+ MC_replay_liveness(mc_stack_liveness, 0);
}
}
if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
- //if(reached(pair_succ->automaton_state)){
- if(reached_hash(pair_succ->automaton_state)){
+ if(reached(pair_succ->automaton_state)){
+ //if(reached_hash(pair_succ->automaton_state)){
- XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1);
+ XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1);
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("Counter-example that violates formula :");
- MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
- MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless);
+ MC_show_stack_liveness(mc_stack_liveness);
+ MC_dump_stack_liveness(mc_stack_liveness);
MC_print_statistics_pairs(mc_stats_pair);
exit(0);
}else{
- XBT_DEBUG("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+ XBT_DEBUG("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- //set_pair_reached(pair_succ->automaton_state);
- set_pair_reached_hash(pair_succ->automaton_state);
+ set_pair_reached(pair_succ->automaton_state);
+ //set_pair_reached_hash(pair_succ->automaton_state);
- //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(search_cycle);
+ MC_ddfs(search_cycle);
}
//if(!visited(pair_succ->automaton_state, search_cycle)){
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(search_cycle);
+ MC_ddfs(search_cycle);
}else{
if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
- //set_pair_reached(pair_succ->automaton_state);
- set_pair_reached_hash(pair_succ->automaton_state);
+ set_pair_reached(pair_succ->automaton_state);
+ //set_pair_reached_hash(pair_succ->automaton_state);
search_cycle = 1;
- //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
- XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
}
- //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
- if(!visited(pair_succ->automaton_state, search_cycle)){
+ if(!visited_hash(pair_succ->automaton_state, search_cycle)){
+ //if(!visited(pair_succ->automaton_state, search_cycle)){
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(search_cycle);
+ MC_ddfs(search_cycle);
}else{
/* Restore system before checking others successors */
if(cursor != xbt_dynar_length(successors) - 1)
- MC_replay_liveness(mc_stack_liveness_stateless, 1);
+ MC_replay_liveness(mc_stack_liveness, 1);
}
}
- if(xbt_fifo_size(mc_stack_liveness_stateless) == MAX_DEPTH_LIVENESS ){
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness_stateless) );
+ if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){
+ XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
}else{
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness_stateless) );
+ XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
}
MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness_stateless);
+ xbt_fifo_shift(mc_stack_liveness);
if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
- //xbt_dynar_pop(reached_pairs, NULL);
- xbt_dynar_pop(reached_pairs_hash, NULL);
+ xbt_dynar_pop(reached_pairs, NULL);
+ //xbt_dynar_pop(reached_pairs_hash, NULL);
}
MC_UNSET_RAW_MEM;
}
-
