X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37628abb1a6de84ea9ddee484632b6a9d6245c96..afd3a47e007a0f91d206cc2e47b69b4b86970fc2:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 143aac7dbf..4e8285c26c 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -12,11 +12,6 @@ #include #include -#ifndef WIN32 -#include -#endif - -#include #include #include @@ -28,25 +23,21 @@ #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 { -struct DerefAndCompareByNbProcessesAndUsedHeap { +struct DerefAndCompareByActorsCountAndUsedHeap { template bool operator()(X const& a, Y const& b) { - return std::make_pair(a->nb_processes, a->heap_bytes_used) < - std::make_pair(b->nb_processes, b->heap_bytes_used); + return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used); } }; @@ -64,19 +55,6 @@ XBT_PRIVATE extern FILE *dot_output; 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; - /********************************** Snapshot comparison **********************************/ //#define MC_DEBUG 1 @@ -84,9 +62,6 @@ XBT_PRIVATE extern mc_stats_t mc_stats; /********************************** Miscellaneous **********************************/ -XBT_PRIVATE void MC_report_assertion_error(void); -XBT_PRIVATE void MC_report_crash(int status); - SG_END_DECL() #ifdef __cplusplus