X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4978a3ae13dbfca366661d84d801f1acc7a6e017..2ddaad87cbb9584159fd9ea054a4dd0dbf1224b2:/src/mc/mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index fdf91f6a68..bf29aa9089 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -24,6 +24,8 @@
 
 /****************************** Snapshots ***********************************/
 
+#define nb_regions 3 /* binary data (data + BSS), libsimgrid data (data + BSS), std_heap */ 
+
 typedef struct s_mc_mem_region{
   int type;
   void *start_addr;
@@ -33,8 +35,12 @@ typedef struct s_mc_mem_region{
 
 typedef struct s_mc_snapshot{
   unsigned int num_reg;
+  int region_type[nb_regions];
+  size_t heap_chunks_used;
   mc_mem_region_t *regions;
+  size_t *stack_sizes;
   xbt_dynar_t stacks;
+  int nb_processes;
 } s_mc_snapshot_t, *mc_snapshot_t;
 
 typedef struct s_mc_snapshot_stack{
@@ -209,6 +215,27 @@ extern void *end_got_plt_libsimgrid;
 extern void *start_got_plt_binary;
 extern void *end_got_plt_binary;
 
+/********************************** Snapshot comparison **********************************/
+
+typedef struct s_mc_comparison_times{
+  double nb_processes_comparison_time;
+  double chunks_used_comparison_time;
+  double stacks_sizes_comparison_time;
+  double binary_global_variables_comparison_time;
+  double libsimgrid_global_variables_comparison_time;
+  double heap_comparison_time;
+  double stacks_comparison_time;
+}s_mc_comparison_times_t, *mc_comparison_times_t;
+
+extern mc_comparison_times_t mc_comp_times;
+extern double mc_snapshot_comparison_time;
+
+int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2);
+int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2);
+void print_comparison_times(void);
+
+//#define MC_DEBUG 1
+//#define MC_VERBOSE 1
 
 /********************************** DPOR for safety  **************************************/
 typedef enum {
@@ -225,6 +252,11 @@ void MC_dpor(void);
 void MC_dpor_exit(void);
 void MC_init(void);
 
+typedef struct s_mc_safety_visited_state{
+  mc_snapshot_t system_state;
+  int num;
+}s_mc_safety_visited_state_t, *mc_safety_visited_state_t;
+
 
 /********************************** Double-DFS for liveness property**************************************/
 
@@ -242,23 +274,11 @@ typedef struct s_mc_pair{
   xbt_state_t automaton_state;
 }s_mc_pair_t, *mc_pair_t;
 
-typedef struct s_mc_comparison_times{
-  int nb_comparisons;
-  xbt_dynar_t snapshot_comparison_times;
-  xbt_dynar_t chunks_used_comparison_times;
-  xbt_dynar_t stacks_sizes_comparison_times;
-  xbt_dynar_t binary_global_variables_comparison_times;
-  xbt_dynar_t libsimgrid_global_variables_comparison_times;
-  xbt_dynar_t heap_comparison_times;
-  xbt_dynar_t stacks_comparison_times;
-}s_mc_comparison_times_t, *mc_comparison_times_t;
-
 typedef struct s_mc_pair_reached{
   int nb;
   xbt_state_t automaton_state;
   xbt_dynar_t prop_ato;
   mc_snapshot_t system_state;
-  mc_comparison_times_t comparison_times;
 }s_mc_pair_reached_t, *mc_pair_reached_t;
 
 typedef struct s_mc_pair_visited{
@@ -269,14 +289,11 @@ typedef struct s_mc_pair_visited{
 
 int MC_automaton_evaluate_label(xbt_exp_label_t l);
 mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
-mc_comparison_times_t new_comparison_times(void);
 
 int reached(xbt_state_t st);
 void set_pair_reached(xbt_state_t st);
 int visited(xbt_state_t st);
-int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall,
-                                   mc_snapshot_t s1, mc_snapshot_t s2);
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, mc_comparison_times_t ct1, mc_comparison_times_t ct2);
+
 void MC_pair_delete(mc_pair_t pair);
 void MC_exit_liveness(void);
 mc_state_t MC_state_pair_new(void);
@@ -286,7 +303,8 @@ void pair_visited_free(mc_pair_visited_t pair);
 void pair_visited_free_voidp(void *p);
 void MC_init_liveness(void);
 void MC_init_memory_map_info(void);
-void MC_print_comparison_times_statistics(mc_comparison_times_t ct);
+
+int get_heap_region_index(mc_snapshot_t s);
 
 /* **** Double-DFS stateless **** */
 
@@ -307,12 +325,6 @@ void pair_stateless_free_voidp(void *p);
 /********************************** Configuration of MC **************************************/
 extern xbt_fifo_t mc_stack_safety;
 
-extern int _surf_mc_checkpoint;
-extern char* _surf_mc_property_file;
-extern int _surf_mc_timeout;
-extern int _surf_mc_max_depth;
-extern int _surf_mc_visited;
-
 /****** Core dump ******/
 
 int create_dump(int pair);
@@ -409,6 +421,9 @@ typedef struct s_variable_value{
   }value;
 }s_variable_value_t, *variable_value_t;
 
+void variable_value_free_voidp(void* v);
+void variable_value_free(variable_value_t v);
+
 void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *variables);
 void print_local_variables(xbt_dict_t list);
 char *get_libsimgrid_path(void);