/****************************** Snapshots ***********************************/
-#define nb_regions 3 /* binary data (data + BSS), libsimgrid data (data + BSS), std_heap */
+#define NB_REGIONS 3 /* binary data (data + BSS) (type = 2), libsimgrid data (data + BSS) (type = 1), std_heap (type = 0)*/
typedef struct s_mc_mem_region{
- int type;
void *start_addr;
void *data;
size_t size;
} s_mc_mem_region_t, *mc_mem_region_t;
typedef struct s_mc_snapshot{
- unsigned int num_reg;
- int region_type[nb_regions];
size_t heap_bytes_used;
- mc_mem_region_t *regions;
+ mc_mem_region_t regions[NB_REGIONS];
+ int nb_processes;
size_t *stack_sizes;
xbt_dynar_t stacks;
- int nb_processes;
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);
/********************************* Requests ***********************************/
int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2);
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 **************************************/
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);
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 MC_dpor_init(void);
void MC_dpor(void);
-void MC_init(void);
typedef struct s_mc_safety_visited_state{
mc_snapshot_t system_state;