-/* 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. */
}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);
+mc_snapshot_t MC_take_snapshot(int num_state);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
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;
-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 **********************************/
extern __thread mc_comparison_times_t mc_comp_times;
extern __thread double mc_snapshot_comparison_time;
-int snapshot_compare(void *p1, void *p2);
+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);
typedef struct s_mc_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 atomic_propositions;
int requests;
+}s_mc_pair_t, *mc_pair_t;
+
+typedef struct s_mc_visited_pair{
+ int num;
+ int other_num; /* Dot output for */
+ int acceptance_pair;
+ mc_state_t graph_state; /* System state included */
+ xbt_automaton_state_t automaton_state;
+ xbt_dynar_t atomic_propositions;
size_t heap_bytes_used;
int nb_processes;
- int stack_removed;
- int visited_removed;
int acceptance_removed;
-}s_mc_pair_t, *mc_pair_t;
+ int visited_removed;
+}s_mc_visited_pair_t, *mc_visited_pair_t;
mc_pair_t MC_pair_new(void);
void MC_pair_delete(mc_pair_t);
void mc_pair_free_voidp(void *p);
+mc_visited_pair_t MC_visited_pair_new(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions);
+void MC_visited_pair_delete(mc_visited_pair_t p);
void MC_ddfs_init(void);
void MC_ddfs(void);
/********************************** 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 struct s_mc_object_info {
+ char* file_name;
+ char* start_text;
+ char* start_data;
+ char* start_bss;
+ void* start_plt;
+ void* end_plt;
+ void* start_got_plt;
+ void* end_got_plt;
+ xbt_dict_t local_variables;
+ xbt_dynar_t global_variables;
+ xbt_dict_t types;
+} s_mc_object_info_t, *mc_object_info_t;
+
+mc_object_info_t MC_new_object_info();
+mc_object_info_t MC_find_object_info(memory_map_t maps, char* name);
+void MC_free_object_info(mc_object_info_t* p);
+
+void MC_dwarf_get_variables(mc_object_info_t info);
+
+extern mc_object_info_t mc_libsimgrid_info;
+extern mc_object_info_t mc_binary_info;
typedef enum {
e_dw_loclist,