-/* Copyright (c) 2007-2013 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. */
#include "msg/msg.h"
#include "msg/datatypes.h"
#include "xbt/strbuff.h"
+#include "xbt/parmap.h"
/****************************** Snapshots ***********************************/
} 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;
+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);
-int is_stack_ignore_variable(char *frame, char *var_name);
+
+extern xbt_dynar_t mc_checkpoint_ignore;
/********************************* MC Global **********************************/
extern double *mc_time;
extern FILE *dot_output;
-extern const char* colors[10];
+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);
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 ***********************************/
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 */
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);
-void get_binary_plt_section(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;
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);
size_t heap_bytes_used;
int nb_processes;
int num;
+ int other_num; // dot_output for
}s_mc_visited_state_t, *mc_visited_state_t;
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_automaton_state_t automaton_state;
- int requests;
- int num;
-}s_mc_pair_t, *mc_pair_t;
-
-typedef struct s_mc_acceptance_pair{
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 prop_ato;
- mc_snapshot_t system_state;
- size_t heap_bytes_used;
- int nb_processes;
-}s_mc_acceptance_pair_t, *mc_acceptance_pair_t;
-
-typedef struct s_mc_visited_pair{
- xbt_automaton_state_t automaton_state;
- xbt_dynar_t prop_ato;
- mc_snapshot_t system_state;
- int num;
+ xbt_dynar_t atomic_propositions;
+ int requests;
size_t heap_bytes_used;
int nb_processes;
-}s_mc_visited_pair_t, *mc_visited_pair_t;
+ int stack_removed;
+ int visited_removed;
+ int acceptance_removed;
+}s_mc_pair_t, *mc_pair_t;
-mc_pair_t MC_pair_new(mc_state_t sg, xbt_automaton_state_t st, int r);
+mc_pair_t MC_pair_new(void);
void MC_pair_delete(mc_pair_t);
+void mc_pair_free_voidp(void *p);
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);
-/********************************** Local variables with DWARF **********************************/
+/********************************** 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,
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 with objdump **********************************/
-
-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
+
