/****************************** 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;
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{
}s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
typedef struct s_mc_global_t{
- mc_snapshot_t initial_snapshot;
- 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 heap_comparison_times;
- xbt_dynar_t stacks_comparison_times;
+ 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 MC_take_snapshot_liveness(void);
+//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);
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 {
#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 */
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 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 {
} 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 mc_global_t initial_state_liveness;
extern xbt_automaton_t _mc_property_automaton;
extern int compare;
-extern void *start_plt_libsimgrid;
-extern void *end_plt_libsimgrid;
-extern void *start_plt_binary;
-extern void *end_plt_binary;
extern xbt_dynar_t mc_stack_comparison_ignore;
extern xbt_dynar_t mc_data_bss_comparison_ignore;
-extern void *start_bss_libsimgrid;
+
typedef struct s_mc_pair{
mc_snapshot_t system_state;
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 **** */
typedef struct s_mc_pair_stateless{
/********************************** 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;
-
/****** Core dump ******/
int create_dump(int pair);
}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
