X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..c5309c7efaf73d81f7aa8cb7908348d0db5677fe:/src/mc/mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 17982ed2c0..064926f0a8 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -7,72 +7,65 @@
 #ifndef SIMGRID_MC_PRIVATE_H
 #define SIMGRID_MC_PRIVATE_H
 
+#include "simgrid_config.h"
+
 #include <sys/types.h>
 
-#include "simgrid_config.h"
 #include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
 #ifndef WIN32
 #include <sys/mman.h>
 #endif
+
 #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 "src/mc/mc_base.h"
 #include "mc/datatypes.h"
-#include "xbt/fifo.h"
-#include "xbt/config.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 "xbt/function_types.h"
-#include "xbt/mmalloc.h"
-#include "src/simix/smx_private.h"
-#include "src/xbt/mmalloc/mmprivate.h"
-#include "xbt/automaton.h"
-#include "xbt/hash.h"
-#include <simgrid/msg.h>
-#include "xbt/strbuff.h"
-#include "xbt/parmap.h"
-#include <xbt/base.h>
-
-#include "src/mc/mc_forward.h"
 #include "src/mc/mc_protocol.h"
 
-SG_BEGIN_DECL()
+#ifdef __cplusplus
+namespace simgrid {
+namespace mc {
+
+struct DerefAndCompareByNbProcessesAndUsedHeap {
+  template<class X, class Y>
+  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);
+  }
+};
+
+}
+}
+#endif
 
-typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function_index_item_t;
+SG_BEGIN_DECL()
 
 /********************************* MC Global **********************************/
 
 XBT_PRIVATE void MC_init_dot_output();
 
 XBT_PRIVATE extern FILE *dot_output;
-XBT_PRIVATE extern const char* colors[13];
-XBT_PRIVATE extern xbt_parmap_t parmap;
 
 XBT_PRIVATE extern int user_max_depth_reached;
 
-XBT_PRIVATE int MC_deadlock_check(void);
-XBT_PRIVATE void MC_replay(xbt_fifo_t stack);
-XBT_PRIVATE void MC_replay_liveness(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 int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max);
-
+XBT_PRIVATE void MC_show_deadlock(void);
 
 /****************************** Statistics ************************************/
 
@@ -91,8 +84,6 @@ XBT_PRIVATE void MC_print_statistics(mc_stats_t stats);
 
 /********************************** Snapshot comparison **********************************/
 
-XBT_PRIVATE int snapshot_compare(void *state1, void *state2);
-
 //#define MC_DEBUG 1
 #define MC_VERBOSE 1
 
@@ -101,13 +92,25 @@ XBT_PRIVATE int snapshot_compare(void *state1, void *state2);
 XBT_PRIVATE void MC_report_assertion_error(void);
 XBT_PRIVATE void MC_report_crash(int status);
 
+SG_END_DECL()
+
 #ifdef __cplusplus
 
-XBT_PRIVATE void MC_find_object_address(
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE void find_object_address(
   std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
 
-#endif
+XBT_PRIVATE
+int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2);
 
-SG_END_DECL()
+// Move is somewhere else (in the LivenessChecker class, in the Session class?):
+extern XBT_PRIVATE xbt_automaton_t property_automaton;
+
+}
+}
+
+#endif
 
 #endif