XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
"Logging specific to algorithms for liveness properties verification");
-xbt_dynar_t initial_pairs = NULL;
xbt_fifo_t reached_pairs;
+xbt_fifo_t visited_pairs;
xbt_dynar_t successors = NULL;
-extern mc_snapshot_t initial_snapshot;
+
+//mc_snapshot_t snapshot;
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
- XBT_DEBUG("Compare snapshot");
+ //XBT_DEBUG("Compare snapshot");
if(s1->num_reg != s2->num_reg){
- XBT_DEBUG("Different num_reg");
+ XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
return 1;
}
+ //XBT_DEBUG("Num reg : %d", s1->num_reg);
+
int i;
int errors = 0;
for(i=0 ; i< s1->num_reg ; i++){
-
- if(s1->regions[i]->size != s2->regions[i]->size){
- XBT_DEBUG("Different size of region");
- return 1;
- }
-
- if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
- XBT_DEBUG("Different start addr of region");
- return 1;
- }
-
+
if(s1->regions[i]->type != s2->regions[i]->type){
- XBT_DEBUG("Different type of region");
+ //XBT_DEBUG("Different type of region");
return 1;
}
-
- if(s1->regions[i]->type == 0){
+ switch(s1->regions[i]->type){
+ case 0:
+ //XBT_DEBUG("Region : heap");
+ 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]->start_addr, s2->regions[i]->start_addr)){
- XBT_DEBUG("Different heap (mmalloc_compare)");
+ //XBT_DEBUG("Different heap (mmalloc_compare)");
errors++;
}
- }else{
+ break;
+ case 1 :
+ //XBT_DEBUG("Region : libsimgrid");
+ 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");
+ errors++;
+ }
+ break;
+ case 2:
+ //XBT_DEBUG("Region : program");
+ 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(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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ //XBT_DEBUG("Different memcmp for data in program");
+ errors++;
+ }
+ break;
+ case 3:
+ //XBT_DEBUG("Region : stack");
+ 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(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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- XBT_DEBUG("Different memcmp for data in libsimgrid or program");
+ //XBT_DEBUG("Different memcmp for data in stack");
errors++;
}
+ break;
}
-
-
}
return (errors>0);
-
+
}
-int reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s){
+int reached(xbt_automaton_t a, xbt_state_t st, char *prgm){
if(xbt_fifo_size(reached_pairs) == 0){
return 0;
}else{
-
- MC_SET_RAW_MEM;
xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
xbt_dynar_push_as(prop_ato, int, res);
}
-
+ MC_SET_RAW_MEM;
+ mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(sn, prgm);
+ MC_UNSET_RAW_MEM;
int i=0;
xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs);
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(s, pair_test->system_state) == 0){
+ if(snapshot_compare(sn, pair_test->system_state) == 0){
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 1;
}
}
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 0;
}
}
-void set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn){
+void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm){
MC_SET_RAW_MEM;
pair = xbt_new0(s_mc_pair_reached_t, 1);
pair->automaton_state = st;
pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->system_state = sn;
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state, prgm);
/* Get values of propositional symbols */
unsigned int cursor = 0;
MC_UNSET_RAW_MEM;
+}
+
+int visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){
+
+
+ if(xbt_fifo_size(visited_pairs) == 0){
+
+ return 0;
+
+ }else{
+
+ xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
+
+ /* Get values of propositional symbols */
+ unsigned int cursor = 0;
+ xbt_propositional_symbol_t ps = NULL;
+ xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
+ int (*f)() = ps->function;
+ int res = (*f)();
+ xbt_dynar_push_as(prop_ato, int, res);
+ }
+
+ MC_SET_RAW_MEM;
+ mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(sn, prgm);
+ MC_UNSET_RAW_MEM;
+
+
+ int i=0;
+ xbt_fifo_item_t item = xbt_fifo_get_first_item(visited_pairs);
+ mc_pair_visited_t pair_test = NULL;
+
+ while(i < xbt_fifo_size(visited_pairs)){
+
+ pair_test = (mc_pair_visited_t) xbt_fifo_get_item_content(item);
+
+ if(pair_test->search_cycle == sc) {
+ 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(sn, pair_test->system_state) == 0){
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
+ MC_UNSET_RAW_MEM;
+ return 1;
+ }
+ }
+ }
+ }
+
+ item = xbt_fifo_get_next_item(item);
+
+ i++;
+
+ }
+
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
+ MC_UNSET_RAW_MEM;
+ return 0;
+
+ }
+}
+
+void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){
+
+
+ MC_SET_RAW_MEM;
+
+ mc_pair_visited_t pair = NULL;
+ pair = xbt_new0(s_mc_pair_visited_t, 1);
+ pair->automaton_state = st;
+ pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state, prgm);
+ pair->search_cycle = sc;
+
+ /* Get values of propositional symbols */
+ unsigned int cursor = 0;
+ xbt_propositional_symbol_t ps = NULL;
+ xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
+ int (*f)() = ps->function;
+ int res = (*f)();
+ xbt_dynar_push_as(pair->prop_ato, int, res);
+ }
+
+ xbt_fifo_unshift(visited_pairs, pair);
+
+ MC_UNSET_RAW_MEM;
+
+
}
void MC_pair_delete(mc_pair_t pair){
}
reached_pairs = xbt_fifo_new();
+ visited_pairs = xbt_fifo_new();
successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
- //snapshot = xbt_new0(s_mc_snapshot_t, 1);
- initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(initial_snapshot, prgm);
+ /* Save the initial state */
+ initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(initial_snapshot_liveness, prgm);
MC_UNSET_RAW_MEM;
MC_UNSET_RAW_MEM;
if(cursor != 0){
- MC_restore_snapshot(initial_snapshot);
+ MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
}
xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
MC_UNSET_RAW_MEM;
- set_pair_reached(a, state, initial_snapshot);
+ set_pair_reached(a, state, prgm);
if(cursor != 0){
- MC_restore_snapshot(initial_snapshot);
+ MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
}
smx_process_t process;
mc_pair_stateless_t current_pair = NULL;
- mc_snapshot_t snapshot = NULL;
+
+ //mc_snapshot_t current_snapshot = NULL;
if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
return;
mc_stats_pair->visited_pairs++;
+ //sleep(1);
+
int value;
mc_state_t next_graph_state = NULL;
smx_req_t req = NULL;
if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
+ set_pair_visited(a, current_pair->automaton_state, search_cycle, prgm);
+
if(current_pair->requests > 0){
while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){
}
-
- if(xbt_dynar_length(successors) == 0){
- MC_SET_RAW_MEM;
- next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state, MC_state_interleave_size(next_graph_state));
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
-
cursor = 0;
-
+
xbt_dynar_foreach(successors, cursor, pair_succ){
- if(search_cycle == 1){
+ if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
-
- MC_SET_RAW_MEM;
- snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(snapshot, prgm);
- MC_UNSET_RAW_MEM;
+ if(search_cycle == 1){
- if(reached(a, pair_succ->automaton_state, snapshot) == 1){
+ if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+
+ if(reached(a, pair_succ->automaton_state, prgm) == 1){
- 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_stateless) + 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_print_statistics_pairs(mc_stats_pair);
- exit(0);
+ 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_print_statistics_pairs(mc_stats_pair);
+ exit(0);
- }else{
+ }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_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
- }
+ }
- }
+ }
- }else{
+ }else{
- if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ 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);
-
- MC_SET_RAW_MEM;
- snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(snapshot, prgm);
- MC_UNSET_RAW_MEM;
+ 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);
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
- search_cycle = 1;
+ search_cycle = 1;
- }
+ }
- }
+ }
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
- MC_UNSET_RAW_MEM;
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, search_cycle, 0, prgm);
+ MC_ddfs_stateless(a, search_cycle, 0, prgm);
- /* Restore system before checking others successors */
- if(cursor != (xbt_dynar_length(successors) - 1))
- MC_replay_liveness(mc_stack_liveness_stateless, 1);
+ /* Restore system before checking others successors */
+ if(cursor != (xbt_dynar_length(successors) - 1))
+ MC_replay_liveness(mc_stack_liveness_stateless, 1);
+ }else{
+
+ XBT_DEBUG("Next pair already visited");
+
+ }
}
if(MC_state_interleave_size(current_pair->graph_state) > 0){
}
-
- if(xbt_dynar_length(successors) == 0){
- MC_SET_RAW_MEM;
- next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state, MC_state_interleave_size(next_graph_state));
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
-
cursor = 0;
-
+
xbt_dynar_foreach(successors, cursor, pair_succ){
- if(search_cycle == 1){
+ if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+ if(search_cycle == 1){
- MC_SET_RAW_MEM;
- snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(snapshot, prgm);
- MC_UNSET_RAW_MEM;
-
- if(reached(a, pair_succ->automaton_state, snapshot) == 1){
+ if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
- XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1);
+ if(reached(a, pair_succ->automaton_state, prgm) == 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_print_statistics_pairs(mc_stats_pair);
- exit(0);
+ XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1);
- }else{
+ 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_print_statistics_pairs(mc_stats_pair);
+ exit(0);
- 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);
+ }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);
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
- }
+ }
- }
+ }
- }else{
+ }else{
- if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) && (xbt_fifo_size(mc_stack_liveness_stateless) < (MAX_DEPTH_LIVENESS - 1))){
+ if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) && (xbt_fifo_size(mc_stack_liveness_stateless) < (MAX_DEPTH_LIVENESS - 1))){
- MC_SET_RAW_MEM;
- snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(snapshot, prgm);
- MC_UNSET_RAW_MEM;
-
- set_pair_reached(a, pair_succ->automaton_state, snapshot);
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
- search_cycle = 1;
+ search_cycle = 1;
- }
+ }
- }
+ }
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
- MC_UNSET_RAW_MEM;
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, search_cycle, 0, prgm);
+ MC_ddfs_stateless(a, search_cycle, 0, prgm);
- /* Restore system before checking others successors */
- if(cursor != xbt_dynar_length(successors) - 1)
- MC_replay_liveness(mc_stack_liveness_stateless, 1);
+ /* Restore system before checking others successors */
+ if(cursor != xbt_dynar_length(successors) - 1)
+ MC_replay_liveness(mc_stack_liveness_stateless, 1);
+ }else{
+
+ XBT_DEBUG("Next pair already visited");
+
+ }
+
}
}
+
+ }else{
+
+ XBT_DEBUG("Max depth reached");
+
}
if(xbt_fifo_size(mc_stack_liveness_stateless) == MAX_DEPTH_LIVENESS ){
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle);
+ 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) );
}else{
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle);
+ 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) );
}
if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
xbt_fifo_shift(reached_pairs);
}
- if(snapshot != NULL)
- MC_free_snapshot(snapshot);
MC_UNSET_RAW_MEM;
-
- MC_pair_stateless_delete(current_pair);
-
- /* FIXME : free memory (pair, snapshot)*/
+
}
