X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f67ec4143434bb6d86c17e055e0601a38deed15a..0c9ba8fe774965e25baca201356dd6da90f9bb5d:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 28c1533afb..a49d3e42f8 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -12,41 +11,32 @@ #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 { -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); } }; @@ -62,33 +52,8 @@ 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(void); -/** Stack (of `simgrid::mc::State*`) 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); - /********************************** Snapshot comparison **********************************/ //#define MC_DEBUG 1 @@ -96,9 +61,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