#include "xbt/hash.h"
#include "msg/msg.h"
#include "msg/datatypes.h"
+#include "xbt/strbuff.h"
/****************************** Snapshots ***********************************/
typedef struct s_mc_snapshot{
unsigned int num_reg;
mc_mem_region_t *regions;
+ xbt_dynar_t stacks;
} s_mc_snapshot_t, *mc_snapshot_t;
-extern char *prog_name;
+typedef struct s_mc_snapshot_stack{
+ xbt_strbuff_t local_variables;
+ 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);
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 {
/* an API to query about the status of a heap, we simply call mmstats and */
/* because I now how does structure looks like, then I redefine it here */
-struct mstats {
- size_t bytes_total; /* Total size of the heap. */
- size_t chunks_used; /* Chunks allocated by the user. */
- size_t bytes_used; /* Byte total of user-allocated chunks. */
- size_t chunks_free; /* Chunks in the free list. */
- size_t bytes_free; /* Byte total of chunks in the free list. */
-};
+/* struct mstats { */
+/* size_t bytes_total; /\* Total size of the heap. *\/ */
+/* size_t chunks_used; /\* Chunks allocated by the user. *\/ */
+/* size_t bytes_used; /\* Byte total of user-allocated chunks. *\/ */
+/* size_t chunks_free; /\* Chunks in the free list. *\/ */
+/* size_t bytes_free; /\* Byte total of chunks in the free list. *\/ */
+/* }; */
#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 */
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;
/********************************** DPOR for safety **************************************/
e_mc_reduce_none,
e_mc_reduce_dpor
} 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_snapshot_t initial_snapshot_liveness;
+extern xbt_fifo_t mc_stack_liveness;
+extern mc_global_t initial_state_liveness;
extern xbt_automaton_t _mc_property_automaton;
extern int compare;
+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;
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{
+ 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);
+mc_comparison_times_t new_comparison_times(void);
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);
+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);
+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);
+void MC_print_comparison_times_statistics(mc_comparison_times_t ct);
+
+int get_heap_region_index(mc_snapshot_t s);
/* **** Double-DFS stateless **** */
int requests;
}s_mc_pair_stateless_t, *mc_pair_stateless_t;
-extern xbt_fifo_t mc_stack_liveness;
-
mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r);
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);
+/****** Local variables with DWARF ******/
+
+typedef enum {
+ e_dw_loclist,
+ e_dw_register,
+ e_dw_bregister_op,
+ e_dw_lit,
+ e_dw_fbregister_op,
+ e_dw_piece,
+ e_dw_arithmetic,
+ e_dw_plus_uconst,
+ e_dw_compose,
+ e_dw_deref,
+ e_dw_uconstant,
+ e_dw_sconstant,
+ e_dw_unsupported
+} e_dw_location_type;
+
+typedef struct s_dw_location{
+ e_dw_location_type type;
+ union{
+
+ xbt_dynar_t loclist;
+
+ int reg;
+
+ struct{
+ unsigned int reg;
+ int offset;
+ }breg_op;
+
+ unsigned int lit;
+
+ int fbreg_op;
+
+ int piece;
+
+ unsigned short int deref_size;
+
+ xbt_dynar_t compose;
+
+ char *arithmetic;
+
+ struct{
+ int bytes;
+ 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{
+ long lowpc;
+ long highpc;
+ dw_location_t location;
+}s_dw_location_entry_t, *dw_location_entry_t;
+
+typedef struct s_dw_local_variable{
+ char *name;
+ dw_location_t location;
+}s_dw_local_variable_t, *dw_local_variable_t;
+
+typedef struct s_dw_frame{
+ char *name;
+ 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 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 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
