-#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 <unistd.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
"Logging specific to algorithms for liveness properties verification");
}
+int data_program_region_compare(void *d1, void *d2, size_t size){
+ int distance = 0;
+ int pointer_align;
+ int i;
+
+ for(i=0; i<size; i++){
+ if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
+ fprintf(stderr,"Different byte (offset=%d) (%p - %p) in data program region\n", i, (char *)d1 + i, (char *)d2 + i);
+ distance++;
+ pointer_align = (i /sizeof(void *)) * sizeof(void *);
+ fprintf(stderr, "Pointer address : %p - %p\n", (char *)d1 + pointer_align, (char *)d2 + pointer_align);
+ fprintf(stderr, "Pointed address : %p - %p\n", *((void **)((char *)d1 + pointer_align)), *((void **)((char *)d2 + pointer_align)));
+ }
+ }
+
+ fprintf(stderr, "Hamming distance between data program regions : %d", distance);
+
+ return distance;
+}
+
+int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
+ int distance = 0;
+ int pointer_align;
+ int i;
+
+ for(i=0; i<size; i++){
+ if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
+ fprintf(stderr, "Different byte (offset=%d) (%p - %p) in data libsimgrid region", i, (char *)d1 + i, (char *)d2 + i);
+ distance++;
+ pointer_align = (i /sizeof(void *)) * sizeof(void *);
+ fprintf(stderr, "Pointer address : %p - %p\n", (char *)d1 + pointer_align, (char *)d2 + pointer_align);
+ fprintf(stderr, "Pointed address : %p - %p\n", *((void **)((char *)d1 + pointer_align)), *((void **)((char *)d2 + pointer_align)));
+ }
+ }
+
+ fprintf(stderr, "Hamming distance between data libsimgrid regions : %d", distance);
+
+ return distance;
+}
+
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 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
return 1;
}
return 1;
}
}
- if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data, std_heap)){
+ if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){
if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
XBT_DEBUG("Different heap (mmalloc_compare)");
errors++;
}
}
break;
- /*case 1 :
+ case 1 :
if(s1->regions[i]->size != s2->regions[i]->size){
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);
return 1;
}
}
- if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ 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 :
+ if(s1->regions[i]->size != s2->regions[i]->size){
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different size of data 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){
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ errors++;
+ }else{
+ return 1;
+ }
+ }
+ if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
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;*/
+ break;
default:
break;
}
return (errors > 0);
-
}
int reached(xbt_state_t st){
xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
int res;
- int (*f)();
+ int_f_void_t f;
/* Get values of propositional symbols */
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(prop_ato, int, res);
}
//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);
+ XBT_DEBUG("Pair reached #%u", cursor+1);
if(automaton_state_compare(pair_test->automaton_state, st) == 0){
if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){
//XBT_DEBUG("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points));
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);
+ XBT_DEBUG("Different simcall call in simcalls of action (%d - %d)", (int)req1->call, (int)req2->call);
return 1;
}
if(req1->issuer->pid != req2->issuer->pid){
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(pair->prop_ato, int, res);
}
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(prop_ato, int, res);
}
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(pair->prop_ato, int, res);
}
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(prop_ato, int, res);
}
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(prop_ato, int, res);
}
MC_UNSET_RAW_MEM;
return 1;
}else{
- XBT_DEBUG("Different snapshot");
+ //XBT_DEBUG("Different snapshot");
}
}else{
- XBT_DEBUG("Different values of propositional symbols");
+ //XBT_DEBUG("Different values of propositional symbols");
}
}else{
- XBT_DEBUG("Different automaton state");
+ //XBT_DEBUG("Different automaton state");
}
}else{
- XBT_DEBUG("Different value of search_cycle");
+ //XBT_DEBUG("Different value of search_cycle");
}
region_diff = 0;
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(pair->prop_ato, int, res);
}
unsigned int cursor = 0;
xbt_propositional_symbol_t ps = NULL;
int res;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
- f = ps->function;
+ f = (int_f_void_t)ps->function;
res = (*f)();
xbt_dynar_push_as(pair->prop_ato, int, res);
}
int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp);
int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp);
return (left_res || right_res);
- break;
}
case 1 : {
int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp);
int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp);
return (left_res && right_res);
- break;
}
case 2 : {
int res = MC_automaton_evaluate_label(l->u.exp_not);
return (!res);
- break;
}
case 3 : {
unsigned int cursor = 0;
xbt_propositional_symbol_t p = NULL;
- int (*f)();
+ int_f_void_t f;
xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){
if(strcmp(p->pred, l->u.predicat) == 0){
- f = p->function;
+ f = (int_f_void_t)p->function;
return (*f)();
}
}
return -1;
- break;
}
case 4 : {
return 2;
- break;
}
default :
return -1;
- break;
}
}
XBT_DEBUG("Double-DFS init");
XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Std heap : %p", std_heap);
+ XBT_DEBUG("Raw heap : %p", raw_heap);
+
mc_pair_stateless_t mc_initial_pair = NULL;
mc_state_t initial_graph_state = NULL;
smx_process_t process;
+
MC_wait_for_requests();
/* 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;
mc_stats_pair->visited_pairs++;
- sleep(1);
+ //sleep(1);
int value;
mc_state_t next_graph_state = NULL;
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));
+ XBT_DEBUG("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
}
if(MC_state_interleave_size(current_pair->graph_state) > 0){
- XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness));
+ XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
MC_replay_liveness(mc_stack_liveness, 0);
}
}
}
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) );
+ XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %d, 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) );
+ XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
}
