X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71c8117a9137c59bece62c17a3277fdccd362d0a..708989f9970b6f37f3ca7c7b568bcbfeaa53867f:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index bf2be95d4a..4b4a00c7d2 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,5 +1,10 @@ -#include "private.h" -#include "unistd.h" +/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "mc_private.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); @@ -10,6 +15,8 @@ xbt_dynar_t visited_pairs; xbt_dynar_t visited_pairs_hash; xbt_dynar_t successors; +xbt_dynar_t hosts_table; + /* fast implementation of djb2 algorithm */ unsigned int hash_region(char *str, int str_len){ @@ -30,80 +37,85 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ 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(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(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){ - //XBT_DEBUG("Different heap (mmalloc_compare)"); - 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(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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ - //XBT_DEBUG("Different memcmp for data in libsimgrid"); - return 1; - } - break; - case 2: + case 0: 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 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 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 heap (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(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data, std_heap)){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different heap (mmalloc_compare)"); + errors++; + }else{ + return 1; + } } break; - case 3: + /*case 1 : 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 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 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 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 stack"); - return 1; + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different memcmp for data in libsimgrid"); + XBT_DEBUG("Size : %zu", s1->regions[i]->size); + errors++; + }else{ + return 1; + } } + break;*/ + default: break; } } - return 0; + return (errors > 0); + } @@ -137,18 +149,31 @@ int reached(xbt_state_t st){ cursor = 0; mc_pair_reached_t pair_test = NULL; - + //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points(); + xbt_dynar_foreach(reached_pairs, cursor, pair_test){ + XBT_DEBUG("Pair reached #%d", cursor+1); if(automaton_state_compare(pair_test->automaton_state, st) == 0){ if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - if(snapshot_compare(pair_test->system_state, sn) == 0){ - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 1; - } + //XBT_DEBUG("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points)); + //if(xbt_dict_length(pair_test->rdv_points) == xbt_dict_length(current_rdv_points)){ + //if(rdv_points_compare(pair_test->rdv_points, current_rdv_points) == 0){ + if(snapshot_compare(pair_test->system_state, sn) == 0){ + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 1; + } + /* } + }else{ + XBT_DEBUG("Different size of rdv points (%d - %d)",xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points) ); + }*/ + }else{ + XBT_DEBUG("Different values of propositional symbols"); } + }else{ + XBT_DEBUG("Different automaton state"); } } @@ -161,6 +186,167 @@ int reached(xbt_state_t st){ } } +int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2){ /* d1 = pair_test, d2 = current_pair */ + + xbt_dict_cursor_t cursor_dict = NULL; + char *key; + char *data; + smx_rdv_t rdv1, rdv2; + xbt_fifo_item_t item1, item2; + smx_action_t action1, action2; + xbt_fifo_item_t item_req1, item_req2; + smx_simcall_t req1, req2; + int i=0; + int j=0; + + xbt_dict_foreach(d1, cursor_dict, key, data){ + rdv1 = (smx_rdv_t)data; + rdv2 = xbt_dict_get_or_null(d2, rdv1->name); + if(rdv2 == NULL){ + XBT_DEBUG("Rdv point unknown"); + return 1; + }else{ + if(xbt_fifo_size(rdv1->comm_fifo) != xbt_fifo_size(rdv2->comm_fifo)){ + XBT_DEBUG("Different total of actions in mailbox \"%s\" (%d - %d)", rdv1->name, xbt_fifo_size(rdv1->comm_fifo),xbt_fifo_size(rdv2->comm_fifo) ); + return 1; + }else{ + + XBT_DEBUG("Total of actions in mailbox \"%s\" : %d", rdv1->name, xbt_fifo_size(rdv1->comm_fifo)); + + item1 = xbt_fifo_get_first_item(rdv1->comm_fifo); + item2 = xbt_fifo_get_first_item(rdv2->comm_fifo); + + while(icomm_fifo)){ + action1 = (smx_action_t) xbt_fifo_get_item_content(item1); + action2 = (smx_action_t) xbt_fifo_get_item_content(item2); + + if(action1->type != action2->type){ + XBT_DEBUG("Different type of action"); + return 1; + } + + if(action1->state != action2->state){ + XBT_DEBUG("Different state of action"); + return 1; + } + + if(xbt_fifo_size(action1->simcalls) != xbt_fifo_size(action2->simcalls)){ + XBT_DEBUG("Different size of simcall list (%d - %d", xbt_fifo_size(action1->simcalls), xbt_fifo_size(action2->simcalls)); + return 1; + }else{ + + item_req1 = xbt_fifo_get_first_item(action1->simcalls); + item_req2 = xbt_fifo_get_first_item(action2->simcalls); + + while(jsimcalls)){ + + req1 = (smx_simcall_t) xbt_fifo_get_item_content(item_req1); + req2 = (smx_simcall_t) xbt_fifo_get_item_content(item_req2); + + if(req1->call != req2->call){ + XBT_DEBUG("Different simcall call in simcalls of action (%d - %d)", req1->call, req2->call); + return 1; + } + if(req1->issuer->pid != req2->issuer->pid){ + XBT_DEBUG("Different simcall issuer in simcalls of action (%lu- %lu)", req1->issuer->pid, req2->issuer->pid); + return 1; + } + + item_req1 = xbt_fifo_get_next_item(item_req1); + item_req2 = xbt_fifo_get_next_item(item_req2); + j++; + + } + } + + switch(action1->type){ + case 0: /* execution */ + case 1: /* parallel execution */ + if(strcmp(action1->execution.host->name, action2->execution.host->name) != 0) + return 1; + break; + case 2: /* comm */ + if(action1->comm.type != action2->comm.type) + return 1; + //XBT_DEBUG("Type of comm : %d", action1->comm.type); + + switch(action1->comm.type){ + case 0: /* SEND */ + if(action1->comm.src_proc->pid != action2->comm.src_proc->pid) + return 1; + if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0) + return 1; + break; + case 1: /* RECEIVE */ + if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid) + return 1; + if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0) + return 1; + break; + case 2: /* READY */ + if(action1->comm.src_proc->pid != action2->comm.src_proc->pid) + return 1; + if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0) + return 1; + if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid) + return 1; + if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0) + return 1; + break; + case 3: /* DONE */ + if(action1->comm.src_proc->pid != action2->comm.src_proc->pid) + return 1; + if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0) + return 1; + if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid) + return 1; + if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0) + return 1; + break; + + } /* end of switch on type of comm */ + + if(action1->comm.refcount != action2->comm.refcount) + return 1; + if(action1->comm.detached != action2->comm.detached) + return 1; + if(action1->comm.rate != action2->comm.rate) + return 1; + if(action1->comm.task_size != action2->comm.task_size) + return 1; + if(action1->comm.src_buff != action2->comm.src_buff) + return 1; + if(action1->comm.dst_buff != action2->comm.dst_buff) + return 1; + if(action1->comm.src_data != action2->comm.src_data) + return 1; + if(action1->comm.dst_data != action2->comm.dst_data) + return 1; + + break; + case 3: /* sleep */ + if(strcmp(action1->sleep.host->name, action2->sleep.host->name) != 0) + return 1; + break; + case 4: /* synchro */ + + break; + default: + break; + } + + item1 = xbt_fifo_get_next_item(item1); + item2 = xbt_fifo_get_next_item(item2); + i++; + } + } + } + } + + return 0; + +} + void set_pair_reached(xbt_state_t st){ @@ -171,6 +357,7 @@ void set_pair_reached(xbt_state_t st){ pair->automaton_state = st; pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); pair->system_state = xbt_new0(s_mc_snapshot_t, 1); + //pair->rdv_points = xbt_dict_new(); MC_take_snapshot_liveness(pair->system_state); /* Get values of propositional symbols */ @@ -184,13 +371,38 @@ void set_pair_reached(xbt_state_t st){ res = (*f)(); xbt_dynar_push_as(pair->prop_ato, int, res); } - + + /*xbt_dict_t rdv_points = SIMIX_get_rdv_points(); + + xbt_dict_cursor_t cursor_dict = NULL; + char *key; + char *data; + xbt_fifo_item_t item; + smx_action_t action; + + xbt_dict_foreach(rdv_points, cursor_dict, key, data){ + smx_rdv_t new_rdv = xbt_new0(s_smx_rvpoint_t, 1); + new_rdv->name = strdup(((smx_rdv_t)data)->name); + new_rdv->comm_fifo = xbt_fifo_new(); + xbt_fifo_foreach(((smx_rdv_t)data)->comm_fifo, item, action, smx_action_t) { + smx_action_t a = xbt_new0(s_smx_action_t, 1); + memcpy(a, action, sizeof(s_smx_action_t)); + xbt_fifo_push(new_rdv->comm_fifo, a); + XBT_DEBUG("New action (type = %d, state = %d) in mailbox \"%s\"", action->type, action->state, key); + if(action->type==2) + XBT_DEBUG("Type of communication : %d, Ref count = %d", action->comm.type, action->comm.refcount); + } + //new_rdv->comm_fifo = xbt_fifo_copy(((smx_rdv_t)data)->comm_fifo); + xbt_dict_set(pair->rdv_points, new_rdv->name, new_rdv, NULL); + }*/ + xbt_dynar_push(reached_pairs, &pair); MC_UNSET_RAW_MEM; } + int reached_hash(xbt_state_t st){ @@ -246,11 +458,16 @@ int reached_hash(xbt_state_t st){ xbt_free(prop_ato); MC_UNSET_RAW_MEM; return 1; + }else{ + XBT_DEBUG("Different snapshot"); } + }else{ + XBT_DEBUG("Different values of propositional symbols"); } + }else{ + XBT_DEBUG("Different automaton state"); } - - + region_diff = 0; } @@ -347,9 +564,17 @@ int visited(xbt_state_t st, int sc){ return 1; + }else{ + XBT_DEBUG("Different snapshot"); } + }else{ + XBT_DEBUG("Different values of propositional symbols"); } + }else{ + XBT_DEBUG("Different automaton state"); } + }else{ + XBT_DEBUG("Different value of search_cycle"); } } @@ -419,11 +644,19 @@ int visited_hash(xbt_state_t st, int sc){ xbt_free(prop_ato); MC_UNSET_RAW_MEM; return 1; + }else{ + XBT_DEBUG("Different snapshot"); } + }else{ + XBT_DEBUG("Different values of propositional symbols"); } + }else{ + XBT_DEBUG("Different automaton state"); } + }else{ + XBT_DEBUG("Different value of search_cycle"); } - + region_diff = 0; } @@ -556,13 +789,11 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ } default : return -1; + break; } } - - - /********************* Double-DFS stateless *******************/ void MC_pair_stateless_delete(mc_pair_stateless_t pair){ @@ -581,7 +812,7 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ return p; } -void MC_ddfs_init(){ +void MC_ddfs_init(void){ XBT_DEBUG("**************************************************"); XBT_DEBUG("Double-DFS init"); @@ -602,15 +833,15 @@ void MC_ddfs_init(){ } } - //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); /* Save the initial state */ initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_to_restore_liveness(initial_snapshot_liveness); + MC_take_snapshot_liveness(initial_snapshot_liveness); MC_UNSET_RAW_MEM; @@ -640,8 +871,8 @@ void MC_ddfs_init(){ 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); @@ -678,11 +909,11 @@ void MC_ddfs(int search_cycle){ mc_stats_pair->visited_pairs++; - //sleep(1); + sleep(1); int value; mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; + smx_simcall_t req = NULL; char *req_str; xbt_transition_t transition_succ; @@ -714,7 +945,7 @@ void MC_ddfs(int search_cycle){ MC_state_set_executed_request(current_pair->graph_state, req, value); /* Answer the request */ - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); /* Wait for requests (schedules processes) */ MC_wait_for_requests(); @@ -774,8 +1005,8 @@ void MC_ddfs(int 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) + 1, MC_state_interleave_size(pair_succ->graph_state)); @@ -792,11 +1023,11 @@ void MC_ddfs(int search_cycle){ 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, pair_succ); @@ -831,13 +1062,13 @@ void MC_ddfs(int search_cycle){ 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)); } @@ -922,8 +1153,8 @@ void MC_ddfs(int 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) already reached !", xbt_fifo_size(mc_stack_liveness) + 1); @@ -940,11 +1171,11 @@ void MC_ddfs(int search_cycle){ 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, pair_succ); @@ -977,18 +1208,18 @@ void MC_ddfs(int search_cycle){ 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, pair_succ); @@ -1029,8 +1260,8 @@ void MC_ddfs(int search_cycle){ MC_SET_RAW_MEM; 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;