-/* Copyright (c) 2007-2012 Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2013 Da 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. */
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{
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);
+int is_stack_ignore_variable(char *frame, char *var_name);
/********************************* MC Global **********************************/
+
extern double *mc_time;
+extern FILE *dot_output;
+extern const char* colors[10];
int MC_deadlock_check(void);
void MC_replay(xbt_fifo_t stack, int start);
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);
+void MC_init_dot_output(void);
+int SIMIX_pre_mc_random(smx_simcall_t simcall);
-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);
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;
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);
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 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_pairs;
- unsigned long executed_transitions;
-} s_mc_stats_pair_t, *mc_stats_pair_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. */
#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 */
} s_memory_map_t, *memory_map_t;
+
+void MC_init_memory_map_info(void);
memory_map_t get_memory_map(void);
void free_memory_map(memory_map_t map);
void get_libsimgrid_plt_section(void);
extern void *start_got_plt_binary;
extern void *end_got_plt_binary;
+
/********************************** Snapshot comparison **********************************/
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;
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,
extern e_mc_reduce_t mc_reduce_kind;
extern mc_global_t initial_state_safety;
+extern xbt_fifo_t mc_stack_safety;
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;
+}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;
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;
+ xbt_automaton_state_t automaton_state;
+ int requests;
}s_mc_pair_t, *mc_pair_t;
-typedef struct s_mc_pair_reached{
- int nb;
- xbt_state_t automaton_state;
+typedef struct s_mc_acceptance_pair{
+ int num;
+ xbt_automaton_state_t automaton_state;
xbt_dynar_t prop_ato;
mc_snapshot_t system_state;
-}s_mc_pair_reached_t, *mc_pair_reached_t;
+}s_mc_acceptance_pair_t, *mc_acceptance_pair_t;
-typedef struct s_mc_pair_visited{
- xbt_state_t automaton_state;
+typedef struct s_mc_visited_pair{
+ xbt_automaton_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);
-
-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 **** */
+ int num;
+ size_t heap_bytes_used;
+ int nb_processes;
+}s_mc_visited_pair_t, *mc_visited_pair_t;
-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_t MC_pair_new(mc_state_t sg, xbt_automaton_state_t st, int r);
+void MC_pair_delete(mc_pair_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_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);
-
-/****** Local variables with DWARF ******/
+/********************************** Local variables with DWARF **********************************/
typedef enum {
e_dw_loclist,
void print_local_variables(xbt_dict_t list);
xbt_dict_t MC_get_location_list(const char *elf_file);
-/**** Global variables ****/
+
+/********************************** Global variables with objdump **********************************/
typedef struct s_global_variable{
char *name;
