model-checker : free memory

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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index fcf5333..2424c43 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -33,6 +33,7 @@ typedef struct s_mc_mem_region{
 
 typedef struct s_mc_snapshot{
   unsigned int num_reg;
+  size_t heap_chunks_used;
   mc_mem_region_t *regions;
   xbt_dynar_t stacks;
 } s_mc_snapshot_t, *mc_snapshot_t;
@@ -40,6 +41,7 @@ typedef struct s_mc_snapshot{
 typedef struct s_mc_snapshot_stack{
   xbt_strbuff_t local_variables;
   void *stack_pointer;
+  size_t size_used;
 }s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
 
 typedef struct s_mc_global_t{
@@ -48,6 +50,7 @@ typedef struct s_mc_global_t{
 }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);
@@ -203,6 +206,10 @@ 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;
 
 
 /********************************** DPOR for safety  **************************************/
@@ -220,6 +227,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,8 +254,8 @@ typedef struct s_mc_comparison_times{
   xbt_dynar_t snapshot_comparison_times;
   xbt_dynar_t chunks_used_comparison_times;
   xbt_dynar_t stacks_sizes_comparison_times;
-  xbt_dynar_t program_data_segment_comparison_times;
-  xbt_dynar_t libsimgrid_data_segment_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;
@@ -269,6 +281,8 @@ 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);
@@ -281,6 +295,8 @@ 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 **** */
 
 typedef struct s_mc_pair_stateless{
@@ -300,12 +316,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);
@@ -402,9 +412,25 @@ 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);
 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;
+
+void global_variable_free(global_variable_t v);
+void global_variable_free_voidp(void *v);
+
+extern xbt_dynar_t mc_global_variables;
+
 #endif