model-checker : test dpor without replay from initial state but with

[simgrid.git] / src / mc / private.h

diff --git a/src/mc/private.h b/src/mc/private.h
index 88d4e7d..1f840dd 100644 (file)
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -112,9 +112,18 @@ typedef struct mc_stats {
   unsigned long executed_transitions;
 } s_mc_stats_t, *mc_stats_t;
 
+typedef struct mc_stats_pair {
+  //unsigned long pair_size;
+  unsigned long visited_pairs;
+  unsigned long expanded_pairs;
+  unsigned long executed_transitions;
+} s_mc_stats_pair_t, *mc_stats_pair_t;
+
 extern mc_stats_t mc_stats;
+extern mc_stats_pair_t mc_stats_pair;
 
 void MC_print_statistics(mc_stats_t);
+void MC_print_statistics_pairs(mc_stats_pair_t);
 
 /********************************** MEMORY ******************************/
 /* The possible memory modes for the modelchecker are standard and raw. */
@@ -175,21 +184,39 @@ typedef struct s_mc_pairs{
   mc_snapshot_t system_state;
   mc_state_t graph_state;
   xbt_state_t automaton_state;
-  xbt_dynar_t pairs_reached;
   int num;
 }s_mc_pairs_t, *mc_pairs_t;
 
 typedef struct s_mc_visited_pairs{
-  int num_pair;
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
   int search_cycle;
 }s_mc_visited_pairs_t, *mc_visited_pairs_t;
 
+typedef struct s_mc_reached_pairs{
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+}s_mc_reached_pairs_t, *mc_reached_pairs_t;
+
+extern xbt_fifo_t mc_snapshot_stack;
+
 void MC_dfs_init(xbt_automaton_t a);
 void MC_dfs(xbt_automaton_t automaton, int search_cycle, int restore);
 int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l);
 mc_pairs_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
-void set_pair_visited(int num_pair, int search_cycle);
-int visited(int num_pair, int search_cycle);
-int pair_reached(xbt_dynar_t pairs_reached, int num_pair);
+void set_pair_visited(mc_state_t gs, xbt_state_t as, int search_cycle);
+int visited(mc_state_t gs, xbt_state_t as, int search_cycle);
+int reached(mc_state_t gs, xbt_state_t as);
+void set_pair_reached(mc_state_t gs, xbt_state_t as);
+void MC_show_snapshot_stack(xbt_fifo_t stack);
+void MC_dump_snapshot_stack(xbt_fifo_t stack);
+void MC_pair_delete(mc_pairs_t pair);
+void MC_exit_with_automaton(void);
+mc_state_t MC_state_pair_new(void);
+
+/********************************** Stateful DPOR **************************************/
+
+void MC_stateful_dpor(xbt_automaton_t a, int search_cycle, int restore);
+void MC_stateful_dpor_init(xbt_automaton_t a);
 
 #endif