[trace] avoid Paje inconsistencies by forcing the generation of a time-ordered trace...

[simgrid.git] / src / mc / mc_liveness.c

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index efc9d49..c7b280f 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -135,13 +135,13 @@ 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 = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -364,10 +364,10 @@ void set_pair_reached(xbt_state_t st){
   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 = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -429,10 +429,10 @@ int reached_hash(xbt_state_t st){
     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 = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -503,10 +503,10 @@ void set_pair_reached_hash(xbt_state_t st){
   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 = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -540,10 +540,10 @@ int visited(xbt_state_t st, int sc){
     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 = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -615,10 +615,10 @@ int visited_hash(xbt_state_t st, int sc){
     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 = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -693,10 +693,10 @@ void set_pair_visited_hash(xbt_state_t st, int sc){
   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 = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -727,10 +727,10 @@ void set_pair_visited(xbt_state_t st, int sc){
   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 = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -757,39 +757,33 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){
     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 = (int (*)())p->function;
+       f = (int_f_void_t)p->function;
        return (*f)();
       }
     }
     return -1;
-    break;
   }
   case 4 : {
     return 2;
-    break;
   }
   default : 
     return -1;
-    break;
   }
 }