model-checker : update debug information

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 0b20726..6007680 100644 (file)
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -290,7 +290,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
         XBT_INFO("Local variables are equals in stack %d", cursor + 1);
       }
     }else{
         XBT_INFO("Local variables are equals in stack %d", cursor + 1);
       }
     }else{

-      XBT_INFO("Hamming distance between stacks : %d", diff);
+      XBT_INFO("Hamming distance between stacks %d : %d", cursor + 1, diff);

     }
     cursor++;
   }
     }
     cursor++;
   }


@@ -323,7 +323,10 @@ static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals){
         addr1 = (void *) strtoul(xbt_dynar_get_as(s_tokens1, 1, char *), NULL, 16);
         addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16);
         if(is_heap_equality(heap_equals, addr1, addr2) == 0){
         addr1 = (void *) strtoul(xbt_dynar_get_as(s_tokens1, 1, char *), NULL, 16);
         addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16);
         if(is_heap_equality(heap_equals, addr1, addr2) == 0){

-          XBT_INFO("Variable %s is different between stacks : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+          if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+            XBT_DEBUG("Variable %s is different between stacks : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+          else
+            XBT_INFO("Variable %s is different between stacks", xbt_dynar_get_as(s_tokens1, 0, char *));

           diff++;
         }
       }
           diff++;
         }
       }

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index f875704..d4cbfe6 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -344,7 +344,7 @@ void MC_ddfs(int search_cycle){
   _mc_property_automaton->current_state = current_pair->automaton_state;
 
  
   _mc_property_automaton->current_state = current_pair->automaton_state;
 
  

-  XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
+  XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);

  
   mc_stats_pair->visited_pairs++;
 
  
   mc_stats_pair->visited_pairs++;
 


@@ -371,7 +371,7 @@ void MC_ddfs(int search_cycle){
         /* Debug information */
        
         req_str = MC_request_to_string(req, value);
         /* Debug information */
        
         req_str = MC_request_to_string(req, value);

-        XBT_INFO("Execute: %s", req_str);
+        XBT_DEBUG("Execute: %s", req_str);

         xbt_free(req_str);
 
         MC_state_set_executed_request(current_pair->graph_state, req, value);   
         xbt_free(req_str);
 
         MC_state_set_executed_request(current_pair->graph_state, req, value);   


@@ -451,9 +451,9 @@ void MC_ddfs(int search_cycle){
 
               }else{
 
 
               }else{
 

-                XBT_INFO("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
+                XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);

 
 

-                XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+                XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));

 
                 MC_SET_RAW_MEM;
                 xbt_fifo_unshift(mc_stack_liveness, pair_succ);
 
                 MC_SET_RAW_MEM;
                 xbt_fifo_unshift(mc_stack_liveness, pair_succ);


@@ -477,13 +477,13 @@ void MC_ddfs(int search_cycle){
     
             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_INFO("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
+              XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);

       
               set_pair_reached(pair_succ->automaton_state); 
 
               search_cycle = 1;
 
       
               set_pair_reached(pair_succ->automaton_state); 
 
               search_cycle = 1;
 

-              XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+              XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));

 
             }
 
 
             }
 


@@ -504,7 +504,7 @@ void MC_ddfs(int search_cycle){
         }
 
         if(MC_state_interleave_size(current_pair->graph_state) > 0){
         }
 
         if(MC_state_interleave_size(current_pair->graph_state) > 0){

-          XBT_INFO("Backtracking to depth %d", 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);
         }
       }
           MC_replay_liveness(mc_stack_liveness, 0);
         }
       }


@@ -514,14 +514,14 @@ void MC_ddfs(int search_cycle){
     
   }else{
     
     
   }else{
     

-    XBT_INFO("Max depth reached");
+    XBT_DEBUG("Max depth reached");

 
   }
 
   if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){
 
   }
 
   if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){

-    XBT_INFO("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );
+    XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );

   }else{
   }else{

-    XBT_INFO("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) );
+    XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) );

   }
 
   
   }