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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index f88c5c4414..0bdeb53563 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. */
@@ -7,119 +6,66 @@
 #ifndef SIMGRID_MC_PRIVATE_H
 #define SIMGRID_MC_PRIVATE_H
 
-#include <sys/types.h>
+#include "mc/mc.h"
+#include "xbt/automaton.h"
 
-#include "simgrid_config.h"
-#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
-#ifndef WIN32
-#include <sys/mman.h>
+#ifdef __cplusplus
+#include "src/mc/mc_forward.hpp"
+#include "src/xbt/memory_map.hpp"
 #endif
-#include <elfutils/libdw.h>
 
-#include "mc/mc.h"
-#include "mc_base.h"
-#include "mc/datatypes.h"
-#include "xbt/fifo.h"
-#include "xbt/config.h"
-
-#include "xbt/function_types.h"
-#include "xbt/mmalloc.h"
-#include "../simix/smx_private.h"
-#include "../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>
+#ifdef __cplusplus
+namespace simgrid {
+namespace mc {
 
-#include "mc_forward.h"
-#include "mc_protocol.h"
+struct DerefAndCompareByActorsCountAndUsedHeap {
+  template<class X, class Y>
+  bool operator()(X const& a, Y const& b)
+  {
+    return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
+  }
+};
 
-SG_BEGIN_DECL()
+}
+}
+#endif
 
-typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function_index_item_t;
+SG_BEGIN_DECL()
 
 /********************************* MC Global **********************************/
 
-/** Initialisation of the model-checker
- *
- * @param pid     PID of the target process
- * @param socket  FD for the communication socket **in server mode** (or -1 otherwise)
- */
-void MC_init_model_checker(pid_t pid, int socket);
+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);
-
 
-/****************************** 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 **********************************/
 
-typedef struct s_mc_comparison_times{
-  double nb_processes_comparison_time;
-  double bytes_used_comparison_time;
-  double stacks_sizes_comparison_time;
-  double global_variables_comparison_time;
-  double heap_comparison_time;
-  double stacks_comparison_time;
-}s_mc_comparison_times_t, *mc_comparison_times_t;
-
-extern XBT_PRIVATE __thread mc_comparison_times_t mc_comp_times;
-extern XBT_PRIVATE __thread double mc_snapshot_comparison_time;
-
-XBT_PRIVATE int snapshot_compare(void *state1, void *state2);
-XBT_PRIVATE void print_comparison_times(void);
-
 //#define MC_DEBUG 1
 #define MC_VERBOSE 1
 
 /********************************** Miscellaneous **********************************/
 
-XBT_PRIVATE void MC_dump_stacks(FILE* file);
+SG_END_DECL()
 
-XBT_PRIVATE void MC_report_assertion_error(void);
+#ifdef __cplusplus
 
-XBT_PRIVATE void MC_invalidate_cache(void);
+namespace simgrid {
+namespace mc {
 
-XBT_PRIVATE int MC_important_snapshot(mc_snapshot_t snapshot);
+XBT_PRIVATE void find_object_address(
+  std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
 
-SG_END_DECL()
+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;
+
+}
+}
+
+#endif
 
 #endif