#include "xbt/function_types.h"
#include "xbt/mmalloc.h"
#include "../simix/private.h"
+#include "xbt/automaton.h"
+#include "xbt/hash.h"
/****************************** Snapshots ***********************************/
void MC_free_snapshot(mc_snapshot_t);
/********************************* MC Global **********************************/
+extern double *mc_time;
/* Bound of the MC depth-first search algorithm */
#define MAX_DEPTH 1000
/********************************* Requests ***********************************/
int MC_request_depend(smx_req_t req1, smx_req_t req2);
-char* MC_request_to_string(smx_req_t req);
+char* MC_request_to_string(smx_req_t req, int value);
unsigned int MC_request_testany_fail(smx_req_t req);
-int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);
+/*int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);*/
+int MC_request_is_visible(smx_req_t req);
+int MC_request_is_enabled(smx_req_t req);
+int MC_request_is_enabled_by_idx(smx_req_t req, unsigned int idx);
+int MC_process_is_enabled(smx_process_t process);
/********************************** DPOR **************************************/
void MC_dpor_init(void);
typedef struct mc_state {
unsigned long max_pid; /* Maximum pid at state's creation time */
mc_procstate_t proc_status; /* State's exploration status by process */
- s_smx_req_t executed; /* The executed request of the state */
- unsigned int executed_value; /* The value associated to the request */
+ s_smx_action_t internal_comm; /* To be referenced by the internal_req */
+ s_smx_req_t internal_req; /* Internal translation of request */
+ s_smx_req_t executed_req; /* The executed request of the state */
+ int req_num; /* The request number (in the case of a
+ multi-request like waitany ) */
} s_mc_state_t, *mc_state_t;
extern xbt_fifo_t mc_stack;
void MC_state_interleave_process(mc_state_t state, smx_process_t process);
unsigned int MC_state_interleave_size(mc_state_t state);
int MC_state_process_is_done(mc_state_t state, smx_process_t process);
-void MC_state_set_executed_request(mc_state_t state, smx_req_t req, unsigned int value);
-smx_req_t MC_state_get_executed_request(mc_state_t state, unsigned int *value);
-smx_req_t MC_state_get_request(mc_state_t state, unsigned int *value);
+void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value);
+smx_req_t MC_state_get_executed_request(mc_state_t state, int *value);
+smx_req_t MC_state_get_internal_request(mc_state_t state);
+smx_req_t MC_state_get_request(mc_state_t state, int *value);
/****************************** Statistics ************************************/
typedef struct mc_stats {
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. */
extern void *std_heap;
extern void *raw_heap;
-int raw_heap_fd;
+/* extern int raw_heap_fd; */ /* unused */
#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
memory_map_t get_memory_map(void);
+/********************************** DFS for liveness property**************************************/
+
+typedef struct s_mc_pair{
+ mc_snapshot_t system_state;
+ mc_state_t graph_state;
+ xbt_state_t automaton_state;
+ int num;
+}s_mc_pair_t, *mc_pair_t;
+
+extern xbt_fifo_t mc_snapshot_stack;
+
+int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l);
+mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
+
+int reached(mc_pair_t p);
+void set_pair_reached(mc_pair_t p);
+void MC_show_snapshot_stack(xbt_fifo_t stack);
+void MC_dump_snapshot_stack(xbt_fifo_t stack);
+void MC_pair_delete(mc_pair_t pair);
+void MC_exit_with_automaton(void);
+mc_state_t MC_state_pair_new(void);
+
+/* **** Double-DFS without visited state **** */
+
+void MC_ddfs_with_restore_snapshot_init(xbt_automaton_t a);
+void MC_ddfs_with_restore_snapshot(xbt_automaton_t a, int search_cycle, int restore);
+
+/* **** Double-DFS with visited state **** */
+
+typedef struct s_mc_visited_pair{
+ mc_pair_t pair;
+ int search_cycle;
+}s_mc_visited_pair_t, *mc_visited_pair_t;
+
+void MC_vddfs_with_restore_snapshot_init(xbt_automaton_t a);
+void MC_vddfs_with_restore_snapshot(xbt_automaton_t automaton, int search_cycle, int restore);
+void set_pair_visited(mc_pair_t p, int search_cycle);
+int visited(mc_pair_t p, int search_cycle);
+
+
+/* **** DPOR Cristian with restore snapshot **** */
+
+typedef struct s_mc_state_with_snapshot{
+ mc_snapshot_t system_state;
+ mc_state_t graph_state;
+}s_mc_state_ws_t, *mc_state_ws_t;
+
+mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs);
+void MC_dpor_with_restore_snapshot_init(void);
+void MC_dpor_with_restore_snapshot(void);
+
+/* **** DPOR 2 (invisible and independant transitions) **** */
+
+
+void MC_dpor2_init(xbt_automaton_t a);
+void MC_dpor2(xbt_automaton_t a, int search_cycle);
+
#endif