X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a9ba94edbd1ef8375ba5e7bca9b02f45d4d8b89..9788cd051f72b982ec571c96e84577e9749188b1:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index c0b6287683..f112c7e3e9 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2007-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -23,6 +24,7 @@ #include "msg/msg.h" #include "msg/datatypes.h" #include "xbt/strbuff.h" +#include "xbt/parmap.h" /****************************** Snapshots ***********************************/ @@ -41,27 +43,43 @@ typedef struct s_mc_snapshot{ size_t *stack_sizes; xbt_dynar_t stacks; xbt_dynar_t to_ignore; + char hash_global[41]; + char hash_local[41]; } s_mc_snapshot_t, *mc_snapshot_t; typedef struct s_mc_snapshot_stack{ - xbt_strbuff_t local_variables; + xbt_dynar_t local_variables; void *stack_pointer; + void *real_address; }s_mc_snapshot_stack_t, *mc_snapshot_stack_t; typedef struct s_mc_global_t{ mc_snapshot_t snapshot; int raw_mem_set; + int prev_pair; + char *prev_req; }s_mc_global_t, *mc_global_t; -//void MC_take_snapshot(mc_snapshot_t); +typedef struct s_mc_checkpoint_ignore_region{ + void *addr; + size_t size; +}s_mc_checkpoint_ignore_region_t, *mc_checkpoint_ignore_region_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); + +extern xbt_dynar_t mc_checkpoint_ignore; /********************************* MC Global **********************************/ + extern double *mc_time; +extern FILE *dot_output; +extern const char* colors[13]; +extern xbt_parmap_t parmap; + +extern int user_max_depth_reached; int MC_deadlock_check(void); void MC_replay(xbt_fifo_t stack, int start); @@ -70,10 +88,12 @@ void MC_wait_for_requests(void); void MC_show_deadlock(smx_simcall_t req); void MC_show_stack_safety(xbt_fifo_t stack); void MC_dump_stack_safety(xbt_fifo_t stack); - +void MC_init(void); int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max); + /********************************* Requests ***********************************/ + int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2); char* MC_request_to_string(smx_simcall_t req, int value); unsigned int MC_request_testany_fail(smx_simcall_t req); @@ -82,13 +102,16 @@ int MC_request_is_visible(smx_simcall_t req); int MC_request_is_enabled(smx_simcall_t req); int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx); int MC_process_is_enabled(smx_process_t process); +char *MC_request_get_dot_output(smx_simcall_t req, int value); /******************************** States **************************************/ + /* Possible exploration status of a process in a state */ typedef enum { MC_NOT_INTERLEAVE=0, /* Do not interleave (do not execute) */ MC_INTERLEAVE, /* Interleave the process (one or more request) */ + MC_MORE_INTERLEAVE, /* Interleave twice the process (for mc_random simcall) */ MC_DONE /* Already interleaved */ } e_mc_process_state_t; @@ -109,6 +132,7 @@ typedef struct mc_state { int req_num; /* The request number (in the case of a multi-request like waitany ) */ mc_snapshot_t system_state; /* Snapshot of system state */ + int num; } s_mc_state_t, *mc_state_t; mc_state_t MC_state_new(void); @@ -122,26 +146,22 @@ 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 { unsigned long state_size; unsigned long visited_states; - unsigned long expanded_states; - unsigned long executed_transitions; -} s_mc_stats_t, *mc_stats_t; - -typedef struct mc_stats_pair { - //unsigned long pair_size; unsigned long visited_pairs; + unsigned long expanded_states; unsigned long expanded_pairs; unsigned long executed_transitions; -} s_mc_stats_pair_t, *mc_stats_pair_t; +} s_mc_stats_t, *mc_stats_t; extern mc_stats_t mc_stats; -extern mc_stats_pair_t mc_stats_pair; void MC_print_statistics(mc_stats_t); -void MC_print_statistics_pairs(mc_stats_pair_t); + /********************************** MEMORY ******************************/ /* The possible memory modes for the modelchecker are standard and raw. */ @@ -167,6 +187,7 @@ 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) + /******************************* MEMORY MAPPINGS ***************************/ /* These functions and data structures implements a binary interface for */ /* the proc maps ascii interface */ @@ -177,7 +198,7 @@ typedef struct s_map_region { void *start_addr; /* Start address of the map */ void *end_addr; /* End address of the map */ int prot; /* Memory protection */ - int flags; /* Aditional memory flags */ + int flags; /* Additional memory flags */ void *offset; /* Offset in the file/whatever */ char dev_major; /* Major of the device */ char dev_minor; /* Minor of the device */ @@ -193,16 +214,19 @@ typedef struct s_memory_map { } s_memory_map_t, *memory_map_t; -memory_map_t get_memory_map(void); -void free_memory_map(memory_map_t map); -void get_libsimgrid_plt_section(void); -void get_binary_plt_section(void); + +void MC_init_memory_map_info(void); +memory_map_t MC_get_memory_map(void); +void MC_free_memory_map(memory_map_t map); +void MC_get_libsimgrid_plt_section(void); +void MC_get_binary_plt_section(void); extern void *start_data_libsimgrid; extern void *start_data_binary; extern void *start_bss_binary; extern char *libsimgrid_path; extern void *start_text_libsimgrid; +extern void *start_text_binary; extern void *start_bss_libsimgrid; extern void *start_plt_libsimgrid; extern void *end_plt_libsimgrid; @@ -213,6 +237,7 @@ 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{ @@ -223,19 +248,23 @@ typedef struct s_mc_comparison_times{ double libsimgrid_global_variables_comparison_time; double heap_comparison_time; double stacks_comparison_time; + double hash_global_variables_comparison_time; + double hash_local_variables_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; +extern __thread mc_comparison_times_t mc_comp_times; +extern __thread double mc_snapshot_comparison_time; -int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2); +int snapshot_compare(void *state1, void *state2); 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 +#define MC_VERBOSE 1 + + +/********************************** DPOR for safety property **************************************/ -/********************************** DPOR for safety **************************************/ typedef enum { e_mc_reduce_unset, e_mc_reduce_none, @@ -244,18 +273,22 @@ typedef enum { extern e_mc_reduce_t mc_reduce_kind; extern mc_global_t initial_state_safety; +extern xbt_fifo_t mc_stack_safety; +extern xbt_dict_t first_enabled_state; void MC_dpor_init(void); void MC_dpor(void); -void MC_init(void); -typedef struct s_mc_safety_visited_state{ +typedef struct s_mc_visited_state{ mc_snapshot_t system_state; + size_t heap_bytes_used; + int nb_processes; int num; -}s_mc_safety_visited_state_t, *mc_safety_visited_state_t; + int other_num; // dot_output for +}s_mc_visited_state_t, *mc_visited_state_t; -/********************************** Double-DFS for liveness property**************************************/ +/********************************** Double-DFS for liveness property **************************************/ extern xbt_fifo_t mc_stack_liveness; extern mc_global_t initial_state_liveness; @@ -264,66 +297,39 @@ 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; - mc_state_t graph_state; - xbt_state_t automaton_state; + int num; + int other_num; /* Dot output for */ + int search_cycle; + mc_state_t graph_state; /* System state included */ + xbt_automaton_state_t automaton_state; + xbt_dynar_t atomic_propositions; + int requests; + size_t heap_bytes_used; + int nb_processes; + int stack_removed; + int visited_removed; + int acceptance_removed; }s_mc_pair_t, *mc_pair_t; -typedef struct s_mc_pair_reached{ - int nb; - xbt_state_t automaton_state; - xbt_dynar_t prop_ato; - 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); - -int reached(xbt_state_t st); -void set_pair_reached(xbt_state_t st); -int visited(xbt_state_t st); +mc_pair_t MC_pair_new(void); +void MC_pair_delete(mc_pair_t); +void mc_pair_free_voidp(void *p); -void MC_pair_delete(mc_pair_t pair); -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_memory_map_info(void); - -int get_heap_region_index(mc_snapshot_t s); - -/* **** Double-DFS stateless **** */ - -typedef struct s_mc_pair_stateless{ - mc_state_t graph_state; - xbt_state_t automaton_state; - int requests; -}s_mc_pair_stateless_t, *mc_pair_stateless_t; - -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_ddfs(void); void MC_show_stack_liveness(xbt_fifo_t stack); void MC_dump_stack_liveness(xbt_fifo_t stack); -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; -/****** Core dump ******/ -int create_dump(int pair); +/********************************** Variables with DWARF **********************************/ -/****** Local variables with DWARF ******/ +extern xbt_dict_t mc_local_variables_libsimgrid; +extern xbt_dict_t mc_local_variables_binary; +extern xbt_dynar_t mc_global_variables_libsimgrid; +extern xbt_dynar_t mc_global_variables_binary; +extern xbt_dict_t mc_variables_type_libsimgrid; +extern xbt_dict_t mc_variables_type_binary; typedef enum { e_dw_loclist, @@ -387,52 +393,36 @@ typedef struct s_dw_location_entry{ dw_location_t location; }s_dw_location_entry_t, *dw_location_entry_t; -typedef struct s_dw_local_variable{ +typedef struct s_dw_variable{ + int global; char *name; - dw_location_t location; -}s_dw_local_variable_t, *dw_local_variable_t; + char *type_origin; + union{ + dw_location_t location; + void *address; + }address; +}s_dw_variable_t, *dw_variable_t; typedef struct s_dw_frame{ char *name; void *low_pc; void *high_pc; dw_location_t frame_base; - xbt_dict_t variables; + xbt_dynar_t variables; /* Cannot use dict, there may be several variables with the same name (in different lexical blocks)*/ 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 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); -xbt_dict_t MC_get_location_list(const char *elf_file); +/********************************** Miscellaneous **********************************/ -/**** Global variables ****/ - -typedef struct s_global_variable{ +typedef struct s_local_variable{ + char *frame; + unsigned long ip; char *name; - size_t size; + char *type; 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; + int region; +}s_local_variable_t, *local_variable_t; #endif +