[mc] Move liveness stats out of mc_stats into LivenessChecker

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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index e41f8c0..8308388 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -19,9 +19,9 @@
 #include <elfutils/libdw.h>
 
 #include <simgrid/msg.h>
-#include <xbt/fifo.h>
 #include <xbt/config.h>
 #include <xbt/base.h>
+#include <xbt/automaton.h>
 
 #include "mc/mc.h"
 #include "mc/datatypes.h"
@@ -62,36 +62,19 @@ XBT_PRIVATE void MC_init_dot_output();
 
 XBT_PRIVATE extern FILE *dot_output;
 
-XBT_PRIVATE extern int user_max_depth_reached;
-
-XBT_PRIVATE void MC_replay(xbt_fifo_t stack);
-XBT_PRIVATE void MC_show_deadlock(smx_simcall_t req);
-XBT_PRIVATE void MC_show_stack_safety(xbt_fifo_t stack);
-XBT_PRIVATE void MC_dump_stack_safety(xbt_fifo_t stack);
-XBT_PRIVATE void MC_show_non_termination(void);
-
-/** Stack (of `mc_state_t`) representing the current position of the
- *  the MC in the exploration graph
- *
- *  It is managed by its head (`xbt_fifo_shift` and `xbt_fifo_unshift`).
- */
-XBT_PRIVATE extern xbt_fifo_t mc_stack;
+XBT_PRIVATE void MC_show_deadlock(void);
 
 /****************************** Statistics ************************************/
 
 typedef struct mc_stats {
   unsigned long state_size;
   unsigned long visited_states;
-  unsigned long visited_pairs;
   unsigned long expanded_states;
-  unsigned long expanded_pairs;
   unsigned long executed_transitions;
 } s_mc_stats_t, *mc_stats_t;
 
 XBT_PRIVATE extern mc_stats_t mc_stats;
 
-XBT_PRIVATE void MC_print_statistics(mc_stats_t stats);
-
 /********************************** Snapshot comparison **********************************/
 
 //#define MC_DEBUG 1
@@ -115,6 +98,9 @@ XBT_PRIVATE void find_object_address(
 XBT_PRIVATE
 int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2);
 
+// Move is somewhere else (in the LivenessChecker class, in the Session class?):
+extern XBT_PRIVATE xbt_automaton_t property_automaton;
+
 }
 }