model-checker : correction of dfs algorithm for liveness properties

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

diff --git a/src/mc/private.h b/src/mc/private.h
index 1adc99a..8fa81ad 100644 (file)
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -18,6 +18,8 @@
 #include "xbt/function_types.h"
 #include "xbt/mmalloc.h"
 #include "../simix/private.h"
+#include "xbt/automaton.h"
+#include "xbt/hash.h"
 
 /****************************** Snapshots ***********************************/
 
@@ -111,9 +113,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. */
@@ -168,5 +179,54 @@ typedef struct s_memory_map {
 
 memory_map_t get_memory_map(void);
 
+/********************************** DFS **************************************/
+
+typedef enum {
+  GREEN=0,
+  ORANGE,
+  RED
+}e_mc_color_pair_t;
+
+typedef struct s_mc_pairs{
+  mc_snapshot_t system_state;
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+  int num;
+  e_mc_color_pair_t color;
+  int expanded;
+  int predecessor;
+}s_mc_pairs_t, *mc_pairs_t;
+
+typedef struct s_mc_visited_pairs{
+  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 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(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_dpor_with_restore_snapshot(xbt_automaton_t a, int search_cycle, int restore);
+void MC_dpor_with_restore_snapshot_init(xbt_automaton_t a);
 
 #endif