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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index fbca8a57ef..0a8fd2f680 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_bytes_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{
@@ -42,19 +48,21 @@ typedef struct s_mc_snapshot_stack{
   void *stack_pointer;
 }s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
 
-void MC_take_snapshot(mc_snapshot_t);
-void MC_take_snapshot_liveness(mc_snapshot_t s);
+typedef struct s_mc_global_t{
+  mc_snapshot_t snapshot;
+  int raw_mem_set;
+}s_mc_global_t, *mc_global_t;
+
+//void MC_take_snapshot(mc_snapshot_t);
+mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall);
+mc_snapshot_t MC_take_snapshot(void);
 void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);
-
+void snapshot_stack_free_voidp(void *s);
 
 /********************************* MC Global **********************************/
 extern double *mc_time;
 
-/* Bound of the MC depth-first search algorithm */
-#define MAX_DEPTH 1000
-#define MAX_DEPTH_LIVENESS 500
-
 int MC_deadlock_check(void);
 void MC_replay(xbt_fifo_t stack, int start);
 void MC_replay_liveness(xbt_fifo_t stack, int all_stack);
@@ -113,6 +121,7 @@ void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int valu
 smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value);
 smx_simcall_t MC_state_get_internal_request(mc_state_t state);
 smx_simcall_t MC_state_get_request(mc_state_t state, int *value);
+void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process);
 
 /****************************** Statistics ************************************/
 typedef struct mc_stats {
@@ -159,8 +168,6 @@ extern void *raw_heap;
 #define MC_SET_RAW_MEM    mmalloc_set_current_heap(raw_heap)
 #define MC_UNSET_RAW_MEM  mmalloc_set_current_heap(std_heap)
 
-extern int raw_mem_set;
-
 /******************************* MEMORY MAPPINGS ***************************/
 /* These functions and data structures implements a binary interface for   */
 /* the proc maps ascii interface                                           */
@@ -189,8 +196,46 @@ typedef struct s_memory_map {
 
 memory_map_t get_memory_map(void);
 void free_memory_map(memory_map_t map);
-void get_plt_section(void);
+void get_libsimgrid_plt_section(void);
+void get_binary_plt_section(void);
+
+extern void *start_data_libsimgrid;
+extern void *end_raw_heap;
+extern void *start_data_binary;
+extern void *start_bss_binary;
+extern char *libsimgrid_path;
+extern void *start_text_libsimgrid;
+extern void *start_bss_libsimgrid;
+extern void *start_plt_libsimgrid;
+extern void *end_plt_libsimgrid;
+extern void *start_plt_binary;
+extern void *end_plt_binary;
+extern void *start_got_plt_libsimgrid;
+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 bytes_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 {
@@ -200,21 +245,28 @@ typedef enum {
 } e_mc_reduce_t;
 
 extern e_mc_reduce_t mc_reduce_kind;
+extern mc_global_t initial_state_safety;
 
 void MC_dpor_init(void);
 void MC_dpor(void);
 void MC_dpor_exit(void);
-void MC_init_safety(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**************************************/
 
 extern xbt_fifo_t mc_stack_liveness;
-extern mc_snapshot_t initial_snapshot_liveness;
+extern mc_global_t initial_state_liveness;
 extern xbt_automaton_t _mc_property_automaton;
 extern int compare;
-extern void *start_plt;
-extern void *end_plt;
+extern xbt_dynar_t mc_stack_comparison_ignore;
+extern xbt_dynar_t mc_data_bss_comparison_ignore;
+
 
 typedef struct s_mc_pair{
   mc_snapshot_t system_state;
@@ -229,15 +281,30 @@ typedef struct s_mc_pair_reached{
   mc_snapshot_t system_state;
 }s_mc_pair_reached_t, *mc_pair_reached_t;
 
+typedef struct s_mc_pair_visited{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  mc_snapshot_t system_state;
+}s_mc_pair_visited_t, *mc_pair_visited_t;
+
 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);
 
 int reached(xbt_state_t st);
 void set_pair_reached(xbt_state_t st);
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2);
+int visited(xbt_state_t st);
+
 void MC_pair_delete(mc_pair_t pair);
 void MC_exit_liveness(void);
 mc_state_t MC_state_pair_new(void);
+void pair_reached_free(mc_pair_reached_t pair);
+void pair_reached_free_voidp(void *p);
+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);
+
+int get_heap_region_index(mc_snapshot_t s);
 
 /* **** Double-DFS stateless **** */
 
@@ -252,14 +319,12 @@ void MC_ddfs_init(void);
 void MC_ddfs(int search_cycle);
 void MC_show_stack_liveness(xbt_fifo_t stack);
 void MC_dump_stack_liveness(xbt_fifo_t stack);
-void MC_pair_stateless_delete(mc_pair_stateless_t pair);
+void pair_stateless_free(mc_pair_stateless_t pair);
+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;
-
 /****** Core dump ******/
 
 int create_dump(int pair);
@@ -274,9 +339,11 @@ typedef enum {
   e_dw_fbregister_op,
   e_dw_piece,
   e_dw_arithmetic,
+  e_dw_plus_uconst,
   e_dw_compose,
   e_dw_deref,
-  e_dw_constant,
+  e_dw_uconstant,
+  e_dw_sconstant,
   e_dw_unsupported
 } e_dw_location_type;
 
@@ -289,34 +356,40 @@ typedef struct s_dw_location{
     int reg;
     
     struct{
-      int reg;
+      unsigned int reg;
       int offset;
     }breg_op;
 
-    unsigned lit;
+    unsigned int lit;
 
     int fbreg_op;
 
     int piece;
 
-    int deref_size;
+    unsigned short int deref_size;
 
     xbt_dynar_t compose;
 
     char *arithmetic;
 
     struct{
-      int is_signed;
       int bytes;
-      int value;
-    }constant;
+      long unsigned int value;
+    }uconstant;
+
+    struct{
+      int bytes;
+      long signed int value;
+    }sconstant;
+
+    unsigned int plus_uconst;
 
   }location;
 }s_dw_location_t, *dw_location_t;
 
 typedef struct s_dw_location_entry{
-  void *lowpc;
-  void *highpc;
+  long lowpc;
+  long highpc;
   dw_location_t location;
 }s_dw_location_entry_t, *dw_location_entry_t;
 
@@ -327,15 +400,46 @@ typedef struct s_dw_local_variable{
 
 typedef struct s_dw_frame{
   char *name;
-  dw_location_t location;
-  xbt_dynar_t variables;
+  void *low_pc;
+  void *high_pc;
+  dw_location_t frame_base;
+  xbt_dict_t variables;
+  unsigned long int start;
+  unsigned long int end;
 }s_dw_frame_t, *dw_frame_t;
 
-/* FIXME : implement free functions for each strcuture */
+/* FIXME : implement free functions for each structure */
+
+extern xbt_dict_t mc_local_variables;
+
+typedef struct s_variable_value{
+  char *type;
+  
+  union{
+    void *address;
+    long int res;
+  }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);
+xbt_dict_t MC_get_location_list(const char *elf_file);
+
+/**** Global variables ****/
+
+typedef struct s_global_variable{
+  char *name;
+  size_t size;
+  void *address;
+}s_global_variable_t, *global_variable_t;
 
-extern xbt_dynar_t mc_binary_local_variables;
+void global_variable_free(global_variable_t v);
+void global_variable_free_voidp(void *v);
 
-void MC_get_binary_local_variables(void);
-void print_local_variables(xbt_dynar_t list);
+extern xbt_dynar_t mc_global_variables;
 
 #endif