X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5787a5c839c1f49fec942290449d18b72b036d98..706dd4584b4002e0d948b81d103dd5c4b70db077:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index e41f8c0ad7..0ef9cfb2a8 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -12,31 +12,23 @@ #include #include -#ifndef WIN32 -#include -#endif - -#include #include -#include #include #include +#include #include "mc/mc.h" #include "mc/datatypes.h" #include "src/mc/mc_base.h" #include "src/simix/smx_private.h" -#include "src/xbt/mmalloc/mmprivate.h" #ifdef __cplusplus #include "src/mc/mc_forward.hpp" #include "src/xbt/memory_map.hpp" #endif -#include "src/mc/mc_protocol.h" - #ifdef __cplusplus namespace simgrid { namespace mc { @@ -62,35 +54,7 @@ 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; - -/****************************** 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); +XBT_PRIVATE void MC_show_deadlock(void); /********************************** Snapshot comparison **********************************/ @@ -99,9 +63,6 @@ XBT_PRIVATE void MC_print_statistics(mc_stats_t stats); /********************************** Miscellaneous **********************************/ -XBT_PRIVATE void MC_report_assertion_error(void); -XBT_PRIVATE void MC_report_crash(int status); - SG_END_DECL() #ifdef __cplusplus @@ -115,6 +76,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; + } }