Merge branch 'master' into mc-process

[simgrid.git] / src / mc / mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 997aca0..c19aa1f 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -7,6 +7,8 @@
 #ifndef MC_PRIVATE_H
 #define MC_PRIVATE_H
 
+#include <sys/types.h>
+
 #include "simgrid_config.h"
 #include <stdio.h>
 #include <stdint.h>
@@ -21,29 +23,33 @@
 #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 "msg/datatypes.h"
+#include <simgrid/msg.h>
 #include "xbt/strbuff.h"
 #include "xbt/parmap.h"
 
 #include "mc_forward.h"
+#include "mc_protocol.h"
 
 SG_BEGIN_DECL()
 
 typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function_index_item_t;
 
-/****************************** Snapshots ***********************************/
-
-extern xbt_dynar_t mc_checkpoint_ignore;
-
 /********************************* 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_pid(pid_t pid, int socket);
+
 extern FILE *dot_output;
 extern const char* colors[13];
 extern xbt_parmap_t parmap;
@@ -83,16 +89,13 @@ extern mc_stats_t mc_stats;
 
 void MC_print_statistics(mc_stats_t stats);
 
-extern char *libsimgrid_path;
-
 /********************************** Snapshot comparison **********************************/
 
 typedef struct s_mc_comparison_times{
   double nb_processes_comparison_time;
   double bytes_used_comparison_time;
   double stacks_sizes_comparison_time;
-  double binary_global_variables_comparison_time;
-  double libsimgrid_global_variables_comparison_time;
+  double global_variables_comparison_time;
   double heap_comparison_time;
   double stacks_comparison_time;
 }s_mc_comparison_times_t, *mc_comparison_times_t;
@@ -108,9 +111,6 @@ void print_comparison_times(void);
 
 /********************************** Variables with DWARF **********************************/
 
-dw_frame_t MC_find_function_by_ip(void* ip);
-mc_object_info_t MC_ip_find_object_info(void* ip);
-
 void MC_find_object_address(memory_map_t maps, mc_object_info_t result);
 
 /********************************** Miscellaneous **********************************/
@@ -151,6 +151,8 @@ uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks);
  */
 void MC_dump_stacks(FILE* file);
 
+void MC_report_assertion_error(void);
+
 SG_END_DECL()
 
 #endif