new dfs algorithm with automaton of LTL formula

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

diff --git a/src/mc/private.h b/src/mc/private.h
index a219245..6bfc90a 100644 (file)
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -18,6 +18,7 @@
 #include "xbt/function_types.h"
 #include "xbt/mmalloc.h"
 #include "../simix/private.h"
+#include "xbt/automaton.h"
 
 /****************************** Snapshots ***********************************/
 
@@ -37,6 +38,7 @@ void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);
 
 /********************************* MC Global **********************************/
+extern double *mc_time;
 
 /* Bound of the MC depth-first search algorithm */
 #define MAX_DEPTH 1000
@@ -51,9 +53,13 @@ void MC_dump_stack(xbt_fifo_t stack);
 
 /********************************* Requests ***********************************/
 int MC_request_depend(smx_req_t req1, smx_req_t req2);
-char* MC_request_to_string(smx_req_t req);
+char* MC_request_to_string(smx_req_t req, int value);
 unsigned int MC_request_testany_fail(smx_req_t req);
-int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);
+/*int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);*/
+int MC_request_is_visible(smx_req_t req);
+int MC_request_is_enabled(smx_req_t req);
+int MC_request_is_enabled_by_idx(smx_req_t req, unsigned int idx);
+int MC_process_is_enabled(smx_process_t process);
 
 /********************************** DPOR **************************************/
 void MC_dpor_init(void);
@@ -117,7 +123,7 @@ void MC_print_statistics(mc_stats_t);
 
 extern void *std_heap;
 extern void *raw_heap;
-int raw_heap_fd;
+/* extern int raw_heap_fd; */ /* unused */
 #define STD_HEAP_SIZE   20480000        /* Maximum size of the system's heap */
 
 /* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
@@ -163,5 +169,22 @@ typedef struct s_memory_map {
 
 memory_map_t get_memory_map(void);
 
+/********************************** DFS **************************************/
+
+typedef struct s_mc_pairs{
+  mc_snapshot_t system_state;
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+  int visited;
+  int num;
+}s_mc_pairs_t, *mc_pairs_t;
+
+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_pairs_t p);
+int pair_reached(xbt_dynar_t p, int num_pair);
+
 
 #endif